diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 0a9e5da24..5b44435e8 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -96,7 +96,12 @@ public class Message extends AbstractEntity {
 	public static Message fromCursor(Cursor cursor) {
 		Jid jid;
 		try {
-			jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(COUNTERPART)));
+			String value = cursor.getString(cursor.getColumnIndex(COUNTERPART));
+			if (value!=null) {
+				jid = Jid.fromString(value);
+			} else {
+				jid = null;
+			}
 		} catch (InvalidJidException e) {
 			jid = null;
 		}