diff --git a/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java b/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
index 0a40699cf..1ee62307f 100644
--- a/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
+++ b/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.migrations;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
@@ -52,8 +53,9 @@ public class UuidMigrationJob extends MigrationJob {
 
   @Override
   void performMigration() throws Exception {
-    if (!TextSecurePreferences.isPushRegistered(context)) {
+    if (!TextSecurePreferences.isPushRegistered(context) || TextUtils.isEmpty(TextSecurePreferences.getLocalNumber(context))) {
       Log.w(TAG, "Not registered! Skipping migration, as it wouldn't do anything.");
+      return;
     }
     
     fetchOwnUuid(context);
diff --git a/src/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/src/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
index 3c51b71df..e640bf89d 100644
--- a/src/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
+++ b/src/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
@@ -85,8 +85,10 @@ public final class LiveRecipientCache {
 
         if (localUuid != null) {
           localRecipientId = recipientDatabase.getByUuid(localUuid).or(recipientDatabase.getByE164(localE164)).orNull();
-        } else {
+        } else if (localE164 != null) {
           localRecipientId = recipientDatabase.getByE164(localE164).orNull();
+        } else {
+          throw new AssertionError("Tried to call getSelf() before local data was set!");
         }
 
         if (localRecipientId == null) {