diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3051ed6020265f491a07c12ad5dfe00be285a0b2..90cfb07ea54d112867cca148e25cbc0d8d4f5340 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build:
     - docker:19.03.1-dind
   script:
   - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true
-  - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
   - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
   - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php
index 7749c45597c6d1e5a4007fdf52a3cabc76451e83..0dd32d2f9ba16822cbfd5b2f111ce13305bdad5a 100644
--- a/src/Helpers/Builds.php
+++ b/src/Helpers/Builds.php
@@ -64,6 +64,11 @@
         {
             $ret = array();
 
+            if(is_null($this->currentBuild)){
+                $this->logger->info("Unable to find current build on server, returning empty array");
+                return $ret;
+            }
+
             foreach ($this->builds as $build) {
                
                 if (!$build->checkVersion($this->currentBuild)) {