--- deliantra/server/lib/cf.pm	2007/01/02 17:32:24	1.122
+++ deliantra/server/lib/cf.pm	2007/01/02 23:12:47	1.126
@@ -1177,6 +1177,7 @@
    $map
 }
 
+sub find_map;
 sub find_map {
    my ($path, $origin) = @_;
 
@@ -1221,7 +1222,9 @@
 
       if ($map->should_reset) {
          $map->reset;
-         $map = find_map $path;
+         undef $guard;
+         $map = find_map $path
+            or return;
       }
 
       $cf::MAP{$key} = $map
@@ -2191,5 +2194,7 @@
    },
 );
 
+END { cf::emergency_save }
+
 1