diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 4dd4e7e6..f80893a4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -118,7 +118,8 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
     @Override
     public void onStop(){
         super.onStop();
-        this.mServiceConnection.unbindFromService();
+        if (this.mServiceConnection.isBound())
+            this.mServiceConnection.unbindFromService();
     }
 
     @Override