diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java
index 47bba601e..56504821e 100644
--- a/apps/Development/src/com/android/development/Connectivity.java
+++ b/apps/Development/src/com/android/development/Connectivity.java
@@ -486,7 +486,9 @@ public class Connectivity extends Activity {
         mCm.unregisterNetworkCallback(mCallback);
         mCallback = null;
         unregisterReceiver(mReceiver);
-        mWml.release();
+        if (mWml.isHeld()) {
+            mWml.release();
+        }
     }
 
     @Override