diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index 179b54ae71..3d822f335e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -580,7 +580,7 @@ public class TunnelController implements Logging {
      */
     public void stopTunnel() {
         synchronized (this) {
-            if (_state != TunnelState.RUNNING)
+            if (_state != TunnelState.STARTING && _state != TunnelState.RUNNING)
                 return;
             changeState(TunnelState.STOPPING);
         }
diff --git a/history.txt b/history.txt
index 4863b4ab37..7fd596003e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2015-04-03 zzz
+ * i2ptunnel: Fix stopping tunnel on bad args when starting
+ * wrapper.config: Remove old mortbay Jetty parameters
+
 2015-04-01 zzz
  * I2CP: Allow larger client clock skew (ticket #1503)
  * i2psnark: Fix changing data directory on Windows (ticket #1503)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25340f779d..421ff4f630 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";