diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/RawIpProxyProvider.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/RawIpProxyProvider.java
index 2382907..e72fc39 100644
--- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/RawIpProxyProvider.java
+++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/RawIpProxyProvider.java
@@ -52,6 +52,8 @@ public class RawIpProxyProvider extends ProxyProvider {
                 stateSetter.setState(HState.PREPARING);
                 proxy = new HProxy(input_host, input_host, input_port, input_port, "0.0.0.0");
 
+                maybeRemoveMapping();
+
                 if (!onBeforeIpMapping()) {
                     stateSetter.setState(HState.NOT_CONNECTED);
                     return;
diff --git a/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java b/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java
index ba45b56..77ea986 100644
--- a/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java
+++ b/G-Earth/src/main/java/gearth/ui/connection/ConnectionController.java
@@ -173,5 +173,10 @@ public class ConnectionController extends SubForm {
             getHConnection().abort();
         }
     }
+
+    @Override
+    protected void onExit() {
+        getHConnection().abort();
+    }
     
 }