diff --git a/classes/Notice.php b/classes/Notice.php
index 86eec8e3ad..892f2be30e 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -997,7 +997,9 @@ class Notice extends Managed_DataObject
             }
         }
         if (!$stored instanceof Notice) {
-            throw new ServerException('StartNoticeSave did not give back a Notice');
+            throw new ServerException('StartNoticeSave did not give back a Notice.');
+        } elseif (empty($stored->id)) {
+            throw new ServerException('Supposedly saved Notice has no ID.');
         }
 
         // Only save 'attention' and metadata stuff (URLs, tags...) stuff if