Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 11566)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 11567)
@@ -475,11 +475,11 @@
                 usage.append(" &mdash; <i>").append(sample.getUsage()).append("</i>");
             }
-            if (mandatory != null) {
+            if (mandatory != null && mandatory.length > 0) {
                 usage.append("<br/>mandatory parameters: ").append(Utils.join(", ", Arrays.asList(mandatory)));
             }
-            if (optional != null) {
+            if (optional != null && optional.length > 0) {
                 usage.append("<br/>optional parameters: ").append(Utils.join(", ", Arrays.asList(optional)));
             }
-            if (examples != null) {
+            if (examples != null && examples.length > 0) {
                 usage.append("<br/>examples: ");
                 for (String ex: examples) {
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java	(revision 11566)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java	(revision 11567)
@@ -64,5 +64,5 @@
     @Override
     public String[] getMandatoryParams() {
-        return null;
+        return new String[0];
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java	(revision 11566)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java	(revision 11567)
@@ -111,5 +111,5 @@
 
     public String[] getOptionalParams() {
-        return null;
+        return new String[0];
     }
 
@@ -119,5 +119,5 @@
 
     public String[] getUsageExamples() {
-        return null;
+        return new String[0];
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java	(revision 11566)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java	(revision 11567)
@@ -39,5 +39,5 @@
     @Override
     public String[] getMandatoryParams() {
-        return null;
+        return new String[0];
     }