Index: jbidwatcher/trunk/src/com/jbidwatcher/auction/server/AuctionServerManager.java
===================================================================
--- jbidwatcher/trunk/src/com/jbidwatcher/auction/server/AuctionServerManager.java (revision 527)
+++ jbidwatcher/trunk/src/com/jbidwatcher/auction/server/AuctionServerManager.java (revision 583)
@@ -107,7 +107,11 @@
       AuctionEntry ae = (AuctionEntry) entries.get(auction_id);
       ae.setServer(newServer);
 
-      sEntryManager.addEntry(ae);
+      if (ae.getIdentifier() == null) {
+        ErrorManagement.logMessage("We lost the underlying auction for: " + ae.dumpRecord());
+      } else {
+        sEntryManager.addEntry(ae);
+      }
       MQFactory.getConcrete("splash").enqueue("SET " + count++);
     }