diff --git a/module/block/view/waterfallprogressblock.html.php b/module/block/view/waterfallprogressblock.html.php
index 39441b481a..e8b8d37841 100644
--- a/module/block/view/waterfallprogressblock.html.php
+++ b/module/block/view/waterfallprogressblock.html.php
@@ -12,7 +12,7 @@
         <canvas width='400' height='120' data-responsive='true'></canvas>
       </div>
     </div>
-    <div class='chart-unit'><?php echo "({$lang->project->workHour})";?></div>
+    <div class='chart-unit'><?php echo "({$lang->hourCommon})";?></div>
     <div class='chart-legend'>
       <span class="barline line-pv">PV</span>
       <span class="barline line-ev">EV</span>
diff --git a/module/story/model.php b/module/story/model.php
index 9a58802ec3..1419070768 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2305,6 +2305,7 @@ class storyModel extends model
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectStories();
 
+        if(!$projectID) return array();
         $project = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
 
         $type = strtolower($type);