diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
index 81308058..6e3983e8 100644
--- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
@@ -102,18 +102,19 @@ public JsonBean handleEvent(RequestContext ctx) {
       return createUpdateJob(ctx, true);
     case PUT:
       JobAction action = JobAction.fromString(ctx.getLastURLElement());
-      switch (action) {
-      case ENABLE:
-        return enableJob(ctx, true);
-      case DISABLE:
-        return enableJob(ctx, false);
-      case START:
-        return startJob(ctx);
-      case STOP:
-        return stopJob(ctx);
-      default:
-        return createUpdateJob(ctx, false);
+      if (action != null) {
+        switch (action) {
+          case ENABLE:
+            return enableJob(ctx, true);
+          case DISABLE:
+            return enableJob(ctx, false);
+          case START:
+            return startJob(ctx);
+          case STOP:
+            return stopJob(ctx);
+        }
       }
+      return createUpdateJob(ctx, false);
     case DELETE:
       return deleteJob(ctx);
     }