diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 3bf51d5..4168366 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -479,7 +479,7 @@
      * @return The capabilities with video capabilities applied.
      */
     private int applyVideoCapabilities(int capabilities) {
-        int currentCapabilities = getCallCapabilities();
+        int currentCapabilities = capabilities;
         if (mRemoteVideoCapable) {
             currentCapabilities |= CallCapabilities.SUPPORTS_VT_REMOTE;
         } else {
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index d82b712..f829fd3 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -183,12 +183,17 @@
                 request.getExtras(),
                 request.getVideoState());
 
+        TelephonyConnection connection = null;
         if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) {
-            response.onSuccess(telephonyRequest, new GsmConnection(originalConnection));
+            connection = new GsmConnection(originalConnection);
         } else if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
-            response.onSuccess(telephonyRequest, new CdmaConnection(originalConnection));
-        } else {
+            connection = new CdmaConnection(originalConnection);
+        }
+
+        if (connection == null) {
             response.onCancel(request);
+        } else {
+            response.onSuccess(telephonyRequest, connection);
         }
     }