1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/cuchaz/enigma/CommandMain.java b/src/main/java/cuchaz/enigma/CommandMain.java
index 54f2707..b0a4107 100644
--- a/src/main/java/cuchaz/enigma/CommandMain.java
+++ b/src/main/java/cuchaz/enigma/CommandMain.java
@@ -134,9 +134,15 @@ public class CommandMain {
         File fileMappings = getReadableFile(getArg(args, 1, "enigma mapping", true));
         File result = getWritableFile(getArg(args, 2, "enigma mapping", true));
         String name = getArg(args, 3, "format type", true);
-        Mappings.FormatType formatType = Mappings.FormatType.valueOf(name.toUpperCase());
-        if (formatType == null)
+        Mappings.FormatType formatType;
+        try
+        {
+            formatType = Mappings.FormatType.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e)
+        {
             throw new IllegalArgumentException(name + "is not a valid mapping format!");
+        }
+
         System.out.println("Reading mappings...");
         Mappings mappings = new MappingsEnigmaReader().read(fileMappings);
         System.out.println("Saving new mappings...");