diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
index 22f477e2d9..ddaa5e8c1b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -176,6 +176,11 @@ public class StorageSyncJob extends BaseJob {
       return;
     }
 
+    if (!Recipient.self().hasE164() || !Recipient.self().hasAci()) {
+      Log.w(TAG, "Missing E164 or ACI!");
+      return;
+    }
+
     if (SignalStore.internalValues().storageServiceDisabled()) {
       Log.w(TAG, "Storage service has been manually disabled. Skipping.");
       return;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
index 76950943a7..e9fbd6efea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
@@ -142,7 +142,7 @@ public final class StorageSyncValidations {
 
       if (insert.getContact().isPresent()) {
         SignalServiceAddress address = insert.getContact().get().getAddress();
-        if (self.getE164().get().equals(address.getNumber().or("")) || self.requireAci().equals(address.getAci())) {
+        if (self.requireE164().equals(address.getNumber().or("")) || self.requireAci().equals(address.getAci())) {
           throw new SelfAddedAsContactError();
         }
       }