1 files changed, 5 insertions, 4 deletions
diff --git a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java
index 0bb7f6f..3d88c3e 100644
--- a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java
+++ b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java
@@ -139,10 +139,11 @@ public class MainActivity extends Activity implements ConnectToDeviceDialogListe
     protected void onDestroy() {
 
         Log.v(TAG, "onDestroy ");
-
-        unbindService(mConnection);
-        mPxpServiceProxy = null;
-        super.onDestroy();
+        if(mConnection != null ) {
+            unbindService(mConnection);
+            mPxpServiceProxy = null;
+            super.onDestroy();
+       }
     }
 
     @Override