diff --git a/mbtk/mbtk_rild_v2/src/ril_sim.c b/mbtk/mbtk_rild_v2/src/ril_sim.c
index a0fc554..0d06c59 100755
--- a/mbtk/mbtk_rild_v2/src/ril_sim.c
+++ b/mbtk/mbtk_rild_v2/src/ril_sim.c
@@ -33,24 +33,18 @@
 
     if (err < 0 || p_response->success == 0 || !p_response->p_intermediates)
     {
-        ret = MBTK_SIM_STATE_NOT_READY;
+        if(err >= 0 && at_get_cme_error(p_response)==CME_SIM_NOT_INSERTED)
+        {
+            ret = MBTK_SIM_STATE_ABSENT;
+        }
+        else
+        {
+            ret = MBTK_SIM_STATE_NOT_READY;
+        }
         goto done;
     }
 
-    switch (at_get_cme_error(p_response))
-    {
-        case CME_SUCCESS:
-            break;
-
-        case CME_SIM_NOT_INSERTED:
-            ret = MBTK_SIM_STATE_ABSENT;
-            goto done;
-
-        default:
-            ret = MBTK_SIM_STATE_NOT_READY;
-            goto done;
-    }
-
+    
     /* CPIN? has succeeded, now look at the result */
 
     cpinLine = p_response->p_intermediates->line;