diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 0246583..09a86a9 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -155,7 +155,7 @@
     }
 
     private int checkSubId(int subId) {
-        if (!SubscriptionManager.isValidSubId(subId)) {
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
             throw new RuntimeException("Invalid subId " + subId);
         }
         if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
@@ -433,8 +433,8 @@
         while (mPendingSimRequestQueue.size() > 0) {
             final MmsRequest request = mPendingSimRequestQueue.peek();
             if (request != null) {
-                if (mCurrentSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID ||
-                        mCurrentSubId == request.getSubId()) {
+                if (!SubscriptionManager.isValidSubscriptionId(mCurrentSubId)
+                        || mCurrentSubId == request.getSubId()) {
                     // First or subsequent requests with same SIM ID
                     mPendingSimRequestQueue.remove();
                     addToRunningRequestQueueSynchronized(request);