try to catch some NPE

2 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/services/ExportBackupService.java b/src/main/java/de/pixart/messenger/services/ExportBackupService.java
index 90bb25452..4603a441f 100644
--- a/src/main/java/de/pixart/messenger/services/ExportBackupService.java
+++ b/src/main/java/de/pixart/messenger/services/ExportBackupService.java
@@ -226,7 +226,7 @@ public class ExportBackupService extends Service {
             new Thread(() -> {
                 final Bundle extras = intent.getExtras();
                 boolean notify = false;
-                if (extras != null & extras.containsKey("NOTIFY_ON_BACKUP_COMPLETE")) {
+                if (extras != null && extras.containsKey("NOTIFY_ON_BACKUP_COMPLETE")) {
                     notify = extras.getBoolean("NOTIFY_ON_BACKUP_COMPLETE");
                 }
                 final boolean success = export();
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 03f347519..b06ebc85d 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -4776,6 +4776,11 @@ public class XmppConnectionService extends Service {
     }
 
     private void expireOldMessages(long timestamp) {
-        databaseBackend.expireOldMessages(timestamp);
+        try {
+            databaseBackend.expireOldMessages(timestamp);
+        } catch (Exception e) {
+            e.printStackTrace();
+            expireOldMessages(timestamp);
+        }
     }
 }