Index: bro.bif
===================================================================
--- bro.bif	(revision 6544)
+++ bro.bif	(working copy)
@@ -2127,7 +2127,12 @@
 
 	Val* v = remote_serializer->GetPeerVal(src);
 	if ( ! v )
-		run_time(fmt("peer %d does not exist", int(src)));
+    	{
+		run_time(fmt("peer %d does not exist anymore", int(src)));
+		RecordVal* p = mgr.GetLocalPeerVal();
+		Ref(p);
+		return p;
+        }
 
 	return v;
 	%}

