diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
index 5b2e20440d..96a235eb30 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
@@ -164,6 +164,9 @@ public class SubmitDebugLogRepository {
           gzipOutput.write(reader.next().getBytes());
           gzipOutput.write("\n".getBytes());
         }
+      } catch (IllegalStateException e) {
+        Log.e(TAG, "Failed to read row!", e);
+        return Optional.absent();
       }
 
       StreamUtil.close(gzipOutput);