diff --git a/Jenkinsfile b/Jenkinsfile
index 17252a91d..6ae30fb5f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,12 +8,17 @@ node('build-slave') {
 
          ansiColor('xterm') {
             stage('Checkout') {
-                cleanWs()
-                checkout scm
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                artifact_version = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
-                echo "artifact_version: "+ artifact_version
+                if (!env.hub_org) {
+                    println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
+                    error 'Please resolve the errors and rerun..'
+                } else
+                    println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
             }
+            cleanWs()            
+            checkout scm
+            commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+            build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
+            echo "build_tag: " + build_tag
         }
 
             stage('Build') {