diff --git a/classes/Conversation.php b/classes/Conversation.php
index 9be6113fb8..c76b0169ff 100755
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -63,8 +63,7 @@ class Conversation extends Managed_DataObject
     static function create(Notice $notice)
     {
         if (empty($notice->id)) {
-            common_debug('Tried to create conversation for not yet inserted notice');
-            return null;
+            throw new ServerException(_('Tried to create conversation for not yet inserted notice'));
         }
         $conv = new Conversation();
         $conv->created = common_sql_now();