1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/incallui/ActiveCallsCallListListener.java b/java/com/android/incallui/ActiveCallsCallListListener.java
index 3e4cb9375..d94db8836 100644
--- a/java/com/android/incallui/ActiveCallsCallListListener.java
+++ b/java/com/android/incallui/ActiveCallsCallListListener.java
@@ -49,10 +49,10 @@ public class ActiveCallsCallListListener implements CallList.Listener {
   public void onCallListChange(CallList callList) {
     ImmutableList.Builder<ActiveCallInfo> activeCalls = ImmutableList.builder();
     for (DialerCall call : callList.getAllCalls()) {
-      if (call.getState() != DialerCallState.DISCONNECTED) {
+      if (call.getState() != DialerCallState.DISCONNECTED && call.getAccountHandle() != null) {
         activeCalls.add(
             ActiveCallInfo.builder()
-                .setPhoneAccountHandle(Optional.fromNullable(call.getAccountHandle()))
+                .setPhoneAccountHandle(Optional.of(call.getAccountHandle()))
                 .build());
       }
     }