diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 8f04f1f..e61d5ec 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -163,10 +163,10 @@
     }
 
     void clearCallServiceSelector() {
-        mCallServiceSelector = null;
-
         // TODO(gilad): Un-comment once selectors are converted into wrappers.
         // decrementAssociatedCallCount(mCallServiceSelector);
+
+        mCallServiceSelector = null;
     }
 
     /**
@@ -178,8 +178,9 @@
                 mState == CallState.DIALING ||
                 mState == CallState.RINGING) {
 
-            // TODO(gilad): Add CallState.ABORTED and set it here.
-            // mState = CallState.ABORTED;
+            clearCallService();
+            clearCallServiceSelector();
+            mState = CallState.ABORTED;
         }
     }
 
diff --git a/src/com/android/telecomm/OutgoingCallProcessor.java b/src/com/android/telecomm/OutgoingCallProcessor.java
index c5dd7ac..a0875c9 100644
--- a/src/com/android/telecomm/OutgoingCallProcessor.java
+++ b/src/com/android/telecomm/OutgoingCallProcessor.java
@@ -151,11 +151,14 @@
      * switchboard through the outgoing-calls manager.
      */
     void abort() {
-        mCall.abort();
+        ThreadUtil.checkOnMainThread();
+        if (!mIsAborted) {
+            mCall.abort();
 
-        // TODO(gilad): Add logic to notify the relevant call service and/or selector.
+            // TODO(gilad): Add logic to notify the relevant call service and/or selector.
 
-        mIsAborted = true;
+            mIsAborted = true;
+        }
     }
 
     /**