--- deliantra/server/common/map.C	2006/08/30 06:06:26	1.14
+++ deliantra/server/common/map.C	2006/08/30 08:28:32	1.15
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.14 2006/08/30 06:06:26 root Exp $";
+ *   "$Id: map.C,v 1.15 2006/08/30 08:28:32 root Exp $";
  */
 
 /*
@@ -1183,6 +1183,9 @@
 
     object_thawer thawer (firstname);
 
+    if (!thawer)
+      return;
+
     m->in_memory=MAP_LOADING;
     if (m->tmpname == NULL)    /* if we have loaded unique items from */
       delete_unique_items(m); /* original map before, don't duplicate them */
@@ -1566,6 +1569,9 @@
                 return NULL;
         }
 
+        if (flags & MAP_PLAYER_UNIQUE)
+          INVOKE_MAP (SWAPIN, m);
+
     } else {
         /* If in this loop, we found a temporary map, so load it up. */