diff --git a/sol/stack_get.hpp b/sol/stack_get.hpp
index ad8fd3cc..78b1ac87 100644
--- a/sol/stack_get.hpp
+++ b/sol/stack_get.hpp
@@ -227,7 +227,7 @@ namespace sol {
 		};
 
 		template<>
-		struct pusher<std::nullptr_t> {
+		struct getter<std::nullptr_t> {
 			static std::nullptr_t get(lua_State*, int = -1) {
 				return nullptr;
 			}
diff --git a/sol/stack_push.hpp b/sol/stack_push.hpp
index bcefe3da..98a8bda5 100644
--- a/sol/stack_push.hpp
+++ b/sol/stack_push.hpp
@@ -527,6 +527,13 @@ namespace sol {
 			}
 		};
 
+		template<>
+		struct pusher<std::nullptr_t> {
+			static int push(lua_State* L, std::nullptr_t) {
+				return stack::push(L, nil);
+			}
+		};
+
 		template<>
 		struct pusher<this_state> {
 			static int push(lua_State*, const this_state&) {