diff --git a/config/lang/de-de.json b/config/lang/de-de.json
index 6029c03eb551da31dda9099b80c13d11abed6b93..6404074b4f20bc3e4e396d8236d4d36000ce8f0b 100644
--- a/config/lang/de-de.json
+++ b/config/lang/de-de.json
@@ -312,6 +312,7 @@
     "projectgroup": "Projektgruppe",
     "projectname": "Projektname",
     "projectmanager": "Projektleiter",
+    "project-setup-incomplete": "Ooops: Die Projekt-Einstellungen sind noch nicht abgeschlossen. Gehen Sie in die Projekt-Einstellungen.",
     "queue": "Queue",
     "queue-hint-overview": "neuestes Paket<br>in der ersten<br>Phase %s<br>installieren",
     "raw-data": "Raw data",
diff --git a/config/lang/en-en.json b/config/lang/en-en.json
index 42272e7f9b78f18ca037164d0c34e5c8657f8378..941b70d5484bc4ab9d1b64ace04fda253e3c69cf 100644
--- a/config/lang/en-en.json
+++ b/config/lang/en-en.json
@@ -314,6 +314,7 @@
     "projectgroup": "Project group",
     "projectname": "Project name",
     "projectmanager": "Procekt manager",
+    "project-setup-incomplete": "Ooops: The project settings are not finished. Got to the Setup.",
     "queue": "Queue",
     "queue-hint-overview": "Install newest<br>package in the first<br>phase %s",
     "raw-data": "Raw data",
diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index 730d799104a12e2f6129d177040679c1f72c5da7..cab5b6ac5f6494606db803771fa54d8274dd3e33 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -3265,6 +3265,10 @@ class project extends base {
         $sReturn = '';
         $sContinue = '<span style="font-size: 300%; color:#ace;">&raquo;&raquo;</span><br><br>';
 
+        $aBranches=$this->getRemoteBranches();
+        if(!is_array($aBranches)){
+            return t("project-setup-incomplete");
+        }
 
         $sRepoBar = '';
         $aRepodata = $this->getRepoRevision();
@@ -3306,57 +3310,57 @@ class project extends base {
                 <div><img src="/deployment/images/process/bg_phase.png" alt="' . t("phase") . ' ' . $sPhase . '"></div>
             </div>';
         }
-        $sReturn = '
-        <div class="visualprocess">
-            <div class="process box">
-                <div class="title">' . $this->_oHtml->getIcon('repository') . t("versioncontrol") . '</div>
-                <div class="details">
-                    ' . $sRepoBar . '<br>
-                    <!--
-                    <a href="#h3repo" class="scroll-link">' . t("repositoryinfos") . '</a><br>
-                    -->
-                    ' . t("repositoryinfos") . '<br>
-                    <strong>
-                    ' . $this->_aPrjConfig["build"]["type"] . '</strong> ' . preg_replace('/.*\@(.*):.*/', '($1)', $this->_aPrjConfig["build"]["url"])
-                . ': <strong title="' . t('branch-select') . '">' . count($this->getRemoteBranches()) . '</strong>'
-                . '<br>
+            $sReturn = '
+            <div class="visualprocess">
+                <div class="process box">
+                    <div class="title">' . $this->_oHtml->getIcon('repository') . t("versioncontrol") . '</div>
+                    <div class="details">
+                        ' . $sRepoBar . '<br>
+                        <!--
+                        <a href="#h3repo" class="scroll-link">' . t("repositoryinfos") . '</a><br>
+                        -->
+                        ' . t("repositoryinfos") . '<br>
+                        <strong>
+                        ' . $this->_aPrjConfig["build"]["type"] . '</strong> ' . preg_replace('/.*\@(.*):.*/', '($1)', $this->_aPrjConfig["build"]["url"])
+                    . ': <strong title="' . t('branch-select') . '">' . $aBranches . '</strong>'
+                    . '<br>
+                    </div>
+                    <div>
+                        <img src="/deployment/images/process/bg_vcs.png" alt="' . t("versioncontrol") . '">
+                    </div>
                 </div>
-                <div>
-                    <img src="/deployment/images/process/bg_vcs.png" alt="' . t("versioncontrol") . '">
+                
+                <div class="process">
+                    <div class="title">&nbsp;</div>
+                    <div class="action">' . $sContinue . t("build-hint-overview") . '<br><br>' . ($this->canAcceptPhase() ? $this->renderLink("build") : '') . '</div>
                 </div>
-            </div>
-            
-            <div class="process">
-                <div class="title">&nbsp;</div>
-                <div class="action">' . $sContinue . t("build-hint-overview") . '<br><br>' . ($this->canAcceptPhase() ? $this->renderLink("build") : '') . '</div>
-            </div>
 
-            
-            <div class="process box">
-                <div class="title">' . $this->_oHtml->getIcon('package') . t("archive") . '</div>
-                <div class="details">
-                    ' . $sPackagebar . '<br>
-                    <!--
-                    <a href="#h3versions" class="scroll-link">' . t("packages") . '</a><br>
-                    -->
-                    ' . t("packages") . '<br>
-                    (<strong>' . count($this->_getVersionUsage()) . '</strong>)
+                
+                <div class="process box">
+                    <div class="title">' . $this->_oHtml->getIcon('package') . t("archive") . '</div>
+                    <div class="details">
+                        ' . $sPackagebar . '<br>
+                        <!--
+                        <a href="#h3versions" class="scroll-link">' . t("packages") . '</a><br>
+                        -->
+                        ' . t("packages") . '<br>
+                        (<strong>' . count($this->_getVersionUsage()) . '</strong>)
+                    </div>
+                    <div><img src="/deployment/images/process/bg_archive.png" alt="' . t("archive") . '"></div>
+                </div>
+                
+                <div class="process">
+                    <div class="title">&nbsp;</div>
+                    <div class="action">'.$sContinue . sprintf(t("queue-hint-overview"), $this->getNextPhase()).'</div>
+                </div>
+                
+                <div class="process phases box">
+                    <div class="title">'  . $this->_oHtml->getIcon('phase') . t("phases") . '</div>
+                    ' . ($sPhaseImg ? $sPhaseImg : '<div class="process">' . t("none") . '</div>') . '
                 </div>
-                <div><img src="/deployment/images/process/bg_archive.png" alt="' . t("archive") . '"></div>
-            </div>
-            
-            <div class="process">
-                <div class="title">&nbsp;</div>
-                <div class="action">'.$sContinue . sprintf(t("queue-hint-overview"), $this->getNextPhase()).'</div>
-            </div>
-            
-            <div class="process phases box">
-                <div class="title">'  . $this->_oHtml->getIcon('phase') . t("phases") . '</div>
-                ' . ($sPhaseImg ? $sPhaseImg : '<div class="process">' . t("none") . '</div>') . '
             </div>
-        </div>
-        ';
-
+            ';
+        
         return $sReturn;
     }