diff --git a/src/agents/store/object-model.c b/src/agents/store/object-model.c
index 0f878a0..7587f01 100644
--- a/src/agents/store/object-model.c
+++ b/src/agents/store/object-model.c
@@ -1971,7 +1971,7 @@ StoreObjectUnlinkFromConversation(StoreClient *client, StoreObject *mail)
 		// no conversation guid means nothing to unlink
 		Log(LOG_ERROR, "Unable to unlink mail " GUID_FMT " from conversation: no cid", 
 			mail->guid);
-		return -1;
+		goto abort;
 	}
 	
 	// unlink the mail from the conversation