diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index c53bb061e..77fb2545d 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -154,6 +154,8 @@ public class Message extends AbstractEntity {
 			}
 		} catch (InvalidJidException e) {
 			jid = null;
+		} catch (IllegalStateException e) {
+			return null; // message too long?
 		}
 		Jid trueCounterpart;
 		try {
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index e2c7747b4..d9feabbe0 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -640,8 +640,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 			cursor.moveToLast();
 			do {
 				Message message = Message.fromCursor(cursor);
-				message.setConversation(conversation);
-				list.add(message);
+				if (message != null) {
+					message.setConversation(conversation);
+					list.add(message);
+				}
 			} while (cursor.moveToPrevious());
 		}
 		cursor.close();
diff --git a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java b/src/main/java/eu/siacs/conversations/services/ExportLogsService.java
index 51eced059..91df3e010 100644
--- a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java
+++ b/src/main/java/eu/siacs/conversations/services/ExportLogsService.java
@@ -84,6 +84,8 @@ public class ExportLogsService extends Service {
 		BufferedWriter bw = null;
 		try {
 			for (Message message : mDatabaseBackend.getMessagesIterable(conversation)) {
+				if (message == null)
+					continue;
 				if (message.getType() == Message.TYPE_TEXT || message.hasFileOnRemoteHost()) {
 					String date = simpleDateFormat.format(new Date(message.getTimeSent()));
 					if (bw == null) {