diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index f1f3af99e6..d7b80945de 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -245,7 +245,7 @@ public class RegistrationActivity extends SherlockActivity {
         formattedNumber = countryFormatter.inputDigit(number.charAt(i));
       }
 
-      if (!s.toString().equals(formattedNumber)) {
+      if (formattedNumber != null && !s.toString().equals(formattedNumber)) {
         s.replace(0, s.length(), formattedNumber);
       }
     }