diff --git a/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
index b107d47d9a2305560358a746cb83b281b24a3e6d..09c5558a6d053b1fd779d8a2b1c52ee1e42bf5db 100644
--- a/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
@@ -2,6 +2,8 @@ package net.i2p.desktopgui.router;
 
 import java.io.IOException;
 
+import org.tanukisoftware.wrapper.WrapperManager;
+
 import net.i2p.I2PAppContext;
 import net.i2p.desktopgui.i18n.DesktopguiTranslator;
 import net.i2p.desktopgui.util.ConfigurationManager;
@@ -74,7 +76,16 @@ public class RouterManager {
 	 */
 	public static void shutDown() {
 		if(inI2P()) {
-			getRouter().shutdown(0);
+			Thread t = new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+					WrapperManager.signalStopped(Router.EXIT_HARD);	
+				}
+				
+			});
+			t.start();
+			getRouter().shutdown(Router.EXIT_HARD);
 		}
     }
 	
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index 8adf1da5c6c70ade75e148790eab1166a610dc35..8daa63dac157465108d12872375bb5f00c01d022 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -19,6 +19,7 @@ import net.i2p.util.I2PAppThread;
 import net.i2p.util.SecureDirectory;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.ShellCommand;
+import net.i2p.util.VersionComparator;
 
 import org.mortbay.http.DigestAuthenticator;
 import org.mortbay.http.HashUserRealm;
@@ -303,8 +304,11 @@ public class RouterConsoleRunner {
         try {
         	//TODO: move away from routerconsole into a separate application.
         	//ApplicationManager?
-            String[] args = new String[0];
-            net.i2p.desktopgui.Main.beginStartup(args);
+        	VersionComparator v = new VersionComparator();
+        	if(v.compare(System.getProperty("java.runtime.version"), "1.6") >= 0) {
+                String[] args = new String[0];
+                net.i2p.desktopgui.Main.beginStartup(args);	
+        	}
         } catch (Throwable t) {
             t.printStackTrace();
         }