--- deliantra/server/lib/cf.pm	2007/01/02 17:32:24	1.122
+++ deliantra/server/lib/cf.pm	2007/01/02 23:06:39	1.125
@@ -1221,7 +1221,9 @@
 
       if ($map->should_reset) {
          $map->reset;
-         $map = find_map $path;
+         undef $guard;
+         $map = cf::map::find_map ($path)
+            or return;
       }
 
       $cf::MAP{$key} = $map
@@ -2191,5 +2193,7 @@
    },
 );
 
+END { cf::emergency_save }
+
 1