diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc
index 7c0a0a36..76a807f2 100644
--- a/wrenchboard/src/shared_tool/jobs.cc
+++ b/wrenchboard/src/shared_tool/jobs.cc
@@ -1222,6 +1222,7 @@ long WrenchEditJobs(CVars in, CVars &out) {
             // good to continue
         } else {
             out["status"] = "Valid Job/Task Not Found";
+            return ret;
         }
 
 
@@ -1240,8 +1241,8 @@ long WrenchEditJobs(CVars in, CVars &out) {
       x["job_detail"].set_valid(true);
       job_id = insert_db_record(DBS_VALID, "members_jobs", "members_jobs_id_seq", x);
 
-      if (job_id) {
-           update_db_record(DBS_VALID, "members_jobs", x, job_id) );
+      if (job_id> 0) {
+                update_db_record(DBS_VALID, "members_jobs", x, job_id) ;
                 load_db_record(out, "SELECT *,id AS job_id FROM members_jobs WHERE id = %lu ", job_id);
                 ret = PHP_CREATED_OK;
       } else {