diff --git a/src/hu/blint/ssldroid/SSLDroid.java b/src/hu/blint/ssldroid/SSLDroid.java
index 4a12e5e..420c9d9 100644
--- a/src/hu/blint/ssldroid/SSLDroid.java
+++ b/src/hu/blint/ssldroid/SSLDroid.java
@@ -74,11 +74,11 @@ public class SSLDroid extends Service {
 			for (TcpProxy proxy : tp) {
 	            proxy.stop();
 	        }
-			removeNotification(0);
-			Log.d(TAG, "SSLDroid Service Stopped");
 		} catch (Exception e) {
 			Log.d("SSLDroid", "Error stopping service: " + e.toString());
 		}
+		removeNotification(0);
+		Log.d(TAG, "SSLDroid Service Stopped");
 	}
 
 	public void removeNotification(int id){
diff --git a/src/hu/blint/ssldroid/SSLDroidTunnelDetails.java b/src/hu/blint/ssldroid/SSLDroidTunnelDetails.java
index ad74fb1..be79eb1 100644
--- a/src/hu/blint/ssldroid/SSLDroidTunnelDetails.java
+++ b/src/hu/blint/ssldroid/SSLDroidTunnelDetails.java
@@ -104,7 +104,7 @@ public class SSLDroidTunnelDetails extends Activity {
 	@Override
 	protected void onPause() {
 		super.onPause();
-		saveState();
+		//saveState();
 	}
 
 	@Override