diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
index 510a15501..f8496b4ba 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -434,11 +434,13 @@ public class AccountsManager {
         Collections.emptySet());
 
     // Check that all including master ID are in Pq pre-keys
-    DestinationDeviceValidator.validateCompleteDeviceList(
-        account,
-        pniSignedPreKeys.keySet(),
-        Collections.emptySet());
-
+    if (pniPqLastResortPreKeys != null) {
+      DestinationDeviceValidator.validateCompleteDeviceList(
+          account,
+          pniPqLastResortPreKeys.keySet(),
+          Collections.emptySet());
+    }
+    
     // Check that all devices are accounted for in the map of new PNI registration IDs
     DestinationDeviceValidator.validateCompleteDeviceList(
         account,