diff --git a/module/task/js/finish.js b/module/task/js/finish.js
index 6907ed9bf5..06a90a0e5b 100644
--- a/module/task/js/finish.js
+++ b/module/task/js/finish.js
@@ -12,9 +12,6 @@ $(function()
 
     $('#submit').click(function()
     {
-        if(task.consumed != 0 && $('#currentConsumed').val() == 0)
-        {
-            return confirm(consumedEmpty);
-        }
+        if(task.consumed != 0 && $('#currentConsumed').val() == 0 && $('#currentConsumed').val() != '') return confirm(consumedEmpty);
     })
 })
diff --git a/module/task/model.php b/module/task/model.php
index af4aa9ab5b..352e6632dd 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1737,8 +1737,8 @@ class taskModel extends model
 
             if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
             {
-                if(!$record->consumed[$id])   return print(js::alert($this->lang->task->error->consumedThisTime));
-                if($record->left[$id] === '') return print(js::alert($this->lang->task->error->left));
+                if(!$record->consumed[$id])   helper::end(js::alert($this->lang->task->error->consumedThisTime));
+                if($record->left[$id] === '') helper::end(js::alert($this->lang->task->error->left));
 
                 $estimates[$id] = new stdclass();
                 $estimates[$id]->date     = $record->dates[$id];