diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 857d16cb5708c26b56181f647f94fde1d1e096f1..55e42b471d4a4f17def0dcfb6b6756ba766f255c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -228,8 +228,6 @@ public class ConfigServiceHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null) return;
-        
         if (_t("Shutdown gracefully").equals(_action)) {
             if (_context.hasWrapper())
                 registerWrapperNotifier(Router.EXIT_GRACEFUL, false);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
index 85b043104c565602d2dde9506ba634d7f00f5b3f..a1e9c0261d19ebd5141b7d6dffd9b37c0e00448e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
@@ -157,8 +157,6 @@ public class ConfigUpdateHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null)
-            return;
         if (_action.equals(_t("Check for updates"))) {
             ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context);
             if (mgr == null) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
index e87567796b80f6173a0f0ac4233dc72a79ead463..7be5a8e42e48ddabe53777ba0bdeb6591345681d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
@@ -130,6 +130,7 @@ public abstract class FormHandler {
      * Implement this to perform the final processing (in turn, adding formNotice
      * and formError messages, etc)
      *
+     * Will only be called if _action is non-null and the nonce is valid.
      */
     protected abstract void processForm();
     
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
index 3a71f11ea3cc57ebc4c957050e4dfc31367bee52..eb0c7f74db2cc59afc3f3d218436d99faed84f05 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java
@@ -18,7 +18,6 @@ public class ConfigHomeHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null) return;
         String group = getJettyString("group");
         boolean deleting = _action.equals(_t("Delete selected"));
         boolean adding = _action.equals(_t("Add item"));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
index 6cfa3885a761241b44d09549f803294dac0c844f..c731770cdcabb0835d6e573748dc174d058224b5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
@@ -15,7 +15,6 @@ public class ConfigKeyringHandler extends FormHandler {
     
     @Override
     protected void processForm() {
-        if (_action == null) return;
         boolean adding = _action.equals(_t("Add key"));
         if (adding || _action.equals(_t("Delete key"))) {
             if (_peer == null)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
index bfe2fb87a99bd66acf837e0529b1e4bd4c8f1a2a..073a55fea7fd607fa3e6f5847d3d8f129efd04c4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
@@ -20,7 +20,6 @@ public class ConfigSummaryHandler extends FormHandler {
     
     @Override
     protected void processForm() {
-        if (_action == null) return;
         String group = getJettyString("group");
         boolean deleting = _action.equals(_t("Delete selected"));
         boolean adding = _action.equals(_t("Add item"));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
index d486050fd2b099a77a89201a1e03d63343a7c2de..69dd7fe325bc4cd41840ec3ef86913f6dd33fc7f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java
@@ -395,10 +395,10 @@ public class GraphHelper extends FormHandler {
             for (int i = 0; i < times.length; i++) {
                 _out.write("<option value=\"");
                 _out.write(Integer.toString(times[i]));
-                _out.write("\"");
+                _out.write('"');
                 if (times[i] == _refreshDelaySeconds)
                     _out.write(" selected=\"selected\"");
-                _out.write(">");
+                _out.write('>');
                 if (times[i] > 0)
                     _out.write(DataHelper.formatDuration2(times[i] * 1000));
                 else
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java
index 8a0feb7aecd3485828348ac13ccadbf084bcd25d..16a9fcc7d56e2455e637cbfc8514c23ff1bb0a6f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java
@@ -28,8 +28,6 @@ public class WizardHandler extends FormHandler {
 
     @Override
     protected void processForm() {
-        if (_action == null)
-            return;
         if (getJettyString("cancelbw") != null) {
             cancelNDT();
             for (int i = 0; i < 20 && !_helper.isNDTComplete(); i++) {