diff --git a/module/story/model.php b/module/story/model.php
index 2f4ad51403..58754536a1 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -349,6 +349,7 @@ class storyModel extends model
                 if(empty($field)) continue;
                 if($type == 'requirement' and $field == 'plan') continue;
 
+                if(!isset($story->$field)) continue;
                 if(!empty($story->$field)) continue;
                 if($field == 'estimate' and strlen(trim($story->estimate)) != 0) continue;
 
diff --git a/module/task/control.php b/module/task/control.php
index 847e893667..6b5f6f909c 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -390,6 +390,7 @@ class task extends control
         if($this->post->names)
         {
             $allChanges = $this->task->batchUpdate();
+            if(dao::isError()) die(js::error(dao::getError()));
 
             if(!empty($allChanges))
             {
diff --git a/module/task/model.php b/module/task/model.php
index 830b5146b4..6d228740d5 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -329,6 +329,7 @@ class taskModel extends model
                 $field = trim($field);
                 if(empty($field)) continue;
 
+                if(!isset($task->$field)) continue;
                 if(!empty($task->$field)) continue;
                 if($field == 'estimate' and strlen(trim($task->estimate)) != 0) continue;
 
@@ -1063,6 +1064,7 @@ class taskModel extends model
                 $field = trim($field);
                 if(empty($field)) continue;
 
+                if(!isset($task->$field)) continue;
                 if(!empty($task->$field)) continue;
                 if($field == 'estimate' and strlen(trim($task->estimate)) != 0) continue;
 
@@ -1071,8 +1073,9 @@ class taskModel extends model
             }
         }
 
-        foreach($tasks as $task)
+        foreach($tasks as $taskID => $task)
         {
+            $oldTask = $oldTasks[$taskID];
             $this->dao->update(TABLE_TASK)->data($task)
                 ->autoCheck()