diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/MessageNotifierV2.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/MessageNotifierV2.kt
index 88306b7835..58888008a7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/MessageNotifierV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/MessageNotifierV2.kt
@@ -256,9 +256,11 @@ class MessageNotifierV2(context: Application) : MessageNotifier {
     lastScheduledReminder = 0
     threadReminders.clear()
 
-    val pendingIntent: PendingIntent = PendingIntent.getBroadcast(context, 0, Intent(context, ReminderReceiver::class.java), PendingIntent.FLAG_CANCEL_CURRENT)
-    val alarmManager: AlarmManager? = ContextCompat.getSystemService(context, AlarmManager::class.java)
-    alarmManager?.cancel(pendingIntent)
+    val pendingIntent: PendingIntent? = PendingIntent.getBroadcast(context, 0, Intent(context, ReminderReceiver::class.java), PendingIntent.FLAG_CANCEL_CURRENT)
+    if (pendingIntent != null) {
+      val alarmManager: AlarmManager? = ContextCompat.getSystemService(context, AlarmManager::class.java)
+      alarmManager?.cancel(pendingIntent)
+    }
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java
index 0a6f73511a..d50b370220 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java
@@ -31,7 +31,11 @@ public abstract class PersistentAlarmManagerListener extends BroadcastReceiver {
 
     Log.i(TAG, getClass() + " scheduling for: " + scheduledTime + " action: " + intent.getAction());
 
-    alarmManager.cancel(pendingIntent);
-    alarmManager.set(AlarmManager.RTC_WAKEUP, scheduledTime, pendingIntent);
+    if (pendingIntent != null) {
+      alarmManager.cancel(pendingIntent);
+      alarmManager.set(AlarmManager.RTC_WAKEUP, scheduledTime, pendingIntent);
+    } else {
+      Log.i(TAG, "PendingIntent somehow null, skipping");
+    }
   }
 }