diff --git a/module/task/model.php b/module/task/model.php
index 60b43542ef..263db42f6d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -813,8 +813,7 @@ class taskModel extends model
         $task->files = $this->loadModel('file')->getByObject('task', $taskID);
 
         /* Get related test cases. */
-        $cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->fetchPairs();
-        if($cases) $task->cases = $cases;
+        if($task->story) $task->cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->fetchPairs();
 
         return $this->processTask($task);
     }
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 3b2fca49ee..43cd8bfe28 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -88,7 +88,7 @@
       </fieldset>
       <?php endif;?>
 
-      <?php if(isset($task->cases)):?>
+      <?php if(isset($task->cases) and $task->cases):?>
       <fieldset>
         <legend><?php echo $lang->task->case;?></legend>
         <div class='article-content'>