diff --git a/jenkins/ci-pipelines/ci_stage_1.groovy b/jenkins/ci-pipelines/ci_stage_1.groovy
index 722f9c9..ea221cf 100644
--- a/jenkins/ci-pipelines/ci_stage_1.groovy
+++ b/jenkins/ci-pipelines/ci_stage_1.groovy
@@ -101,12 +101,13 @@
 			    // error("${project} build ${build} failed")
             }
 		} 
-		catch (caughtError) {
+		catch(caughtError) {
 		 echo 'Exception in stage_1'
 		 currentBuild.result = 'FAILURE'
 		}
 		finally {
-			 if((${currentBuild.result} != 'SUCCESS') && (${env.JOB_NAME} == 'daily-stage_4')){
+		    try {
+			 if((currentBuild.result != 'SUCCESS') && (env.JOB_NAME == 'daily-stage_4')){
                emailext (
                    subject: "[OSM-Jenkins] Job: ${env.JOB_NAME} Build: ${env.BUILD_NUMBER} Result: ${currentBuild.result}",
                    body: """ Check console output at "${env.BUILD_URL}"  """,
@@ -114,6 +115,10 @@
                    recipientProviders: [culprits()]
                 )
             }
+		  }
+		  catch(caughtError) {
+		    echo "Failure in executing email"
+		  }
 
 		}
     } 
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 1809d02..42fbe1e 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -235,7 +235,12 @@
                         repo_base_url = "-u ${params.REPOSITORY_BASE}"
                     }
 					if ( params.DO_STAGE_4 ) {
+					    try {
                         sh "docker stack list |grep \"${container_name_prefix}\"|  awk '{ print \$1 }'| xargs docker stack rm"
+						}
+						catch (caughtError) {
+						  println("Caught error: docker stack rm failed!")
+						}
 					}
                     sh """
                         export PATH=$PATH:/snap/bin