diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index a762bd173e..20626a190a 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -405,6 +405,7 @@ class gitlabModel extends model
         $scm = $this->app->loadClass('scm');
         $scm->setEngine($repo);
         $comments = $scm->engine->getCommitsByPath($entry, '', '', isset($pager->recPerPage) ? $pager->recPerPage : 10, isset($pager->pageID) ? $pager->pageID : 1);
+        if(!is_array($comments)) return array();
 
         if(isset($pager->recTotal)) $pager->recTotal = count($comments) < $pager->recPerPage ? $pager->recPerPage * $pager->pageID : $pager->recPerPage * ($pager->pageID + 1);
 
diff --git a/module/instance/control.php b/module/instance/control.php
index a180cb6210..cdab7cf9b3 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -66,7 +66,7 @@ class instance extends control
             $this->view->dbList          = array();
             $this->view->domain          = '';
         }
-        
+
         $this->view->users = $this->loadModel('user')->getPairs('noletter');
         $this->view->tab   = $tab;
         $this->view->type  = $type;
@@ -459,12 +459,12 @@ class instance extends control
             $freeMemory = intval($clusterResource->metrics->memory->allocatable * 0.9); // Remain 10% memory for system.
             if($cloudApp->memory > $freeMemory)
             {
-                $this->view->cloudApp       = $cloudApp;
-                $this->view->gapMemory      = helper::formatKB(intval(($cloudApp->memory - $freeMemory)));
-                $this->view->requiredMemory = helper::formatKB(intval($cloudApp->memory));
-                $this->view->freeMemory     = helper::formatKB(intval($freeMemory));
+                $cloudApp       = $cloudApp;
+                $gapMemory      = helper::formatKB(intval(($cloudApp->memory - $freeMemory)));
+                $requiredMemory = helper::formatKB(intval($cloudApp->memory));
+                $freeMemory     = helper::formatKB(intval($freeMemory));
 
-                return $this->display('instance','resourceerror');
+                return $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->instance->errors->notEnoughMemory, $cloudApp->alias, $requiredMemory, $freeMemory, $gapMemory)));
             }
         }