diff --git a/e2e/apiserver/apiserver_test.go b/e2e/apiserver/apiserver_test.go
index 6b394ef15..ac7914eb2 100644
--- a/e2e/apiserver/apiserver_test.go
+++ b/e2e/apiserver/apiserver_test.go
@@ -167,7 +167,7 @@ var _ = ginkgo.Describe("API Workload", func() {
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			var r apis.Response
 			err = json.Unmarshal(result, &r)
-			gomega.Expect(http.StatusOK).Should(gomega.Equal(r.Code))
+			gomega.Expect(http.StatusInternalServerError).Should(gomega.Equal(r.Code))
 			output := fmt.Sprintf("required flag(s) \"image\" not set")
 			gomega.Expect(r.Data.(string)).To(gomega.ContainSubstring(output))
 		})
diff --git a/pkg/server/handler/workloadHandler.go b/pkg/server/handler/workloadHandler.go
index a614697d1..ac24d4123 100644
--- a/pkg/server/handler/workloadHandler.go
+++ b/pkg/server/handler/workloadHandler.go
@@ -28,6 +28,10 @@ func CreateWorkload(c *gin.Context) {
 	var template types.Capability
 
 	template, err := plugins.LoadCapabilityByName(body.WorkloadType)
+	if err != nil {
+		util.HandleError(c, util.StatusInternalServerError, err.Error())
+		return
+	}
 	appObj, err := oam.BaseComplete(evnName, body.WorkloadName, body.AppGroup, fs, template)
 	if err != nil {
 		util.HandleError(c, util.StatusInternalServerError, err.Error())