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 36660a51..4dd4e7e6 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -115,6 +115,12 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
         }
     }
 
+    @Override
+    public void onStop(){
+        super.onStop();
+        this.mServiceConnection.unbindFromService();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -509,4 +515,9 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
         }
     }
 
+    @Override
+    public void onError(Exception e) {
+
+    }
+
 }