diff --git a/src/org/atriasoft/death/Arguments.java b/src/org/atriasoft/death/Arguments.java
index e804451..d880f8f 100644
--- a/src/org/atriasoft/death/Arguments.java
+++ b/src/org/atriasoft/death/Arguments.java
@@ -100,7 +100,10 @@ public class Arguments {
 			String[] optionList = argument.split("=");
 			Log.verbose("ListArgument = " + optionList);
 			String option = optionList[0];
-			String optionParam = argument.substring(option.length()+1);
+			String optionParam = "";
+			if (argument.length() > option.length()+1) {
+				optionParam = argument.substring(option.length()+1);
+			}
 			Log.verbose("    option= " + option);
 			Log.verbose("    optionParam= " + optionParam);
 			boolean argumentFound=false;