diff --git a/module/build/model.php b/module/build/model.php
index 92850a7fa6..b2a36743cb 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -458,7 +458,7 @@ class buildModel extends model
         $build->bugs    = '';
 
         $build = fixer::input('post')
-            ->setDefault('project,execution,product,branch', 0)
+            ->setDefault('project,execution,product,branch,artifactRepoID', 0)
             ->setDefault('builds,stories,bugs', '')
             ->cleanInt('product')
             ->add('createdBy', $this->app->user->account)
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 09c21884d8..44234b24d6 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 bb87d6321f..13af1be5a5 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -420,12 +420,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)));
             }
         }
 
diff --git a/module/repo/ui/create.html.php b/module/repo/ui/create.html.php
index 5f886eed5f..20d06a9aa2 100644
--- a/module/repo/ui/create.html.php
+++ b/module/repo/ui/create.html.php
@@ -126,7 +126,7 @@ formPanel
     ),
     formRow
     (
-        ($config->isContainer || $config->inQuickon) ? setClass('hidden') : setClass('hide-service'),
+        ($config->inContainer || $config->inQuickon) ? setClass('hidden') : setClass('hide-service'),
         formGroup
         (
             set::name("client"),
diff --git a/module/repo/ui/edit.html.php b/module/repo/ui/edit.html.php
index 9e58c77b28..722b24dbbe 100644
--- a/module/repo/ui/edit.html.php
+++ b/module/repo/ui/edit.html.php
@@ -124,7 +124,7 @@ formPanel
     ),
     formRow
     (
-        ($config->isContainer || $config->inQuickon) ? setClass('hidden') : setClass('hide-service'),
+        ($config->inContainer || $config->inQuickon) ? setClass('hidden') : setClass('hide-service'),
         formGroup
         (
             set::name("client"),