1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/sonarsource/scanner/cli/Main.java b/src/main/java/org/sonarsource/scanner/cli/Main.java
index 8d030e4..a273381 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Main.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Main.java
@@ -65,22 +65,26 @@ public class Main {
     Stats stats = new Stats(logger).start();
 
     int status = Exit.ERROR;
+    boolean started = false;
     try {
       Properties p = conf.properties();
       checkSkip(p);
       configureLogging(p);
       init(p);
       runner.start();
+      started = true;
       logger.info("SonarQube server " + runner.serverVersion());
       runAnalysis(stats, p);
       status = Exit.SUCCESS;
-    } catch (Exception e) {
+    } catch (Throwable e) {
       status = Exit.ERROR;
       displayExecutionResult(stats, "FAILURE");
       showError("Error during SonarQube Scanner execution", e, cli.isDebugEnabled());
     } finally {
       try {
-        runner.stop();
+        if (started) {
+          runner.stop();
+        }
       } catch (Throwable e) {
         status = Exit.ERROR;
         logger.error("Unable to properly stop the scanner", e);