diff --git a/module/execution/model.php b/module/execution/model.php
index 53b145805c..83192be034 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -451,7 +451,7 @@ class executionModel extends model
         if($this->app->tab == 'project')
         {
             $projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($this->session->project)->fetch('model');
-            if($projectModel == 'scrum')
+            if(empty($this->session->project) || $projectModel == 'scrum')
             {
                 $this->lang->project->name = $this->lang->execution->name;
                 $this->lang->project->code = $this->lang->execution->code;
@@ -462,6 +462,11 @@ class executionModel extends model
                 $this->lang->project->code = str_replace($this->lang->project->common, $this->lang->project->stage, $this->lang->project->code);
             }
         }
+        else
+        {
+            $this->lang->project->name = $this->lang->execution->name;
+            $this->lang->project->code = $this->lang->execution->code;
+        }
 
         $this->lang->error->unique = $this->lang->error->repeat;
         $extendFields = $this->getFlowExtendFields();