diff --git a/Jenkinsfile b/Jenkinsfile
index ed14936bf8de1323e453e83756db6cde4ac139c4..4840ef5c4fdd9f22adbf72b3a7beeac225a3478d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,10 +40,14 @@ pipeline {
 
                             sh 'npm run ci-test'
 
-                            if (env.BRANCH_NAME == 'master') {
-                                withSonarQubeEnv('sonarqube-ozg-sh'){
-                                    sh 'npm run ci-sonar'
-                                }
+							try {
+	                            if (env.BRANCH_NAME == 'master') {
+	                                withSonarQubeEnv('sonarqube-ozg-sh'){
+	                                    sh 'npm run ci-sonar'
+	                                }
+	                            }
+                            } catch (Exception e) {
+                               unstable("SonarQube failed")
                             }
                         }
                     }
@@ -68,13 +72,17 @@ pipeline {
                     }
 
                     script {
-                        if (env.BRANCH_NAME == 'master') {
-        	                dir('goofy-server'){
-                                withSonarQubeEnv('sonarqube-ozg-sh'){
-                                    sh 'mvn sonar:sonar'
-                                }
-                            }
-	                    }
+                    	try {
+	                        if (env.BRANCH_NAME == 'master') {
+	        	                dir('goofy-server'){
+	                                withSonarQubeEnv('sonarqube-ozg-sh'){
+	                                    sh 'mvn sonar:sonar'
+	                                }
+	                            }
+		                    }
+                        } catch (Exception e) {
+                            unstable("SonarQube failed")
+                        }	                    
                     }
                 }
             }