--- a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java	Thu Feb 06 10:58:51 2014 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java	Thu Feb 06 11:01:50 2014 -0800
@@ -529,8 +529,12 @@
             }
         }
 
-        if (fileManager.handleOption(name, rest))
-            return;
+        try {
+            if (fileManager.handleOption(name, rest))
+                return;
+        } catch (IllegalArgumentException e) {
+            throw new BadArgs("err.invalid.use.of.option", name).showUsage(true);
+        }
 
         throw new BadArgs("err.unknown.option", name).showUsage(true);
     }