1 files changed, 8 insertions, 1 deletions

diff --git a/src/universe.c b/src/universe.c
index 00de1f3..4689a09 100644
--- a/src/universe.c
+++ b/src/universe.c
@@ -56,7 +56,14 @@ void universe_store( lua_State* L, Universe* U)
 {
         STACK_CHECK( L);
         push_unique_key( L, UNIVERSE_REGKEY);
-        lua_pushlightuserdata( L, U);
+        if( NULL != U)
+        {
+                lua_pushlightuserdata( L, U);
+        }
+        else
+        {
+                lua_pushnil( L);
+        }
         lua_rawset( L, LUA_REGISTRYINDEX);
         STACK_END( L, 0);
 }