diff --git a/src/com/android/contacts/interactions/CallLogInteraction.java b/src/com/android/contacts/interactions/CallLogInteraction.java
index f751ae7..89ca3fb 100644
--- a/src/com/android/contacts/interactions/CallLogInteraction.java
+++ b/src/com/android/contacts/interactions/CallLogInteraction.java
@@ -161,8 +161,9 @@
     }
 
     public String getNumber() {
-        return sBidiFormatter.unicodeWrap(
-                mValues.getAsString(Calls.NUMBER), TextDirectionHeuristics.LTR);
+        final String number = mValues.getAsString(Calls.NUMBER);
+        return number == null ? null :
+            sBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR);
     }
 
     public Integer getNumberPresentation() {
@@ -210,4 +211,4 @@
     public int getIconResourceId() {
         return CALL_LOG_ICON_RES;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/contacts/interactions/SmsInteraction.java b/src/com/android/contacts/interactions/SmsInteraction.java
index 8b26023..8e61213 100644
--- a/src/com/android/contacts/interactions/SmsInteraction.java
+++ b/src/com/android/contacts/interactions/SmsInteraction.java
@@ -92,8 +92,9 @@
     }
 
     public String getAddress() {
-        return sBidiFormatter.unicodeWrap(
-                mValues.getAsString(Sms.ADDRESS), TextDirectionHeuristics.LTR);
+        final String address = mValues.getAsString(Sms.ADDRESS);
+        return address == null ? null :
+            sBidiFormatter.unicodeWrap(address, TextDirectionHeuristics.LTR);
     }
 
     public String getBody() {