diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index c7a27e35c..e127b2995 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -95,7 +95,8 @@ def start():
         return
 
     if conf.smokeTest:
-        smokeTest()
+        if not smokeTest():
+            return
 
     if conf.direct:
         initTargetEnv()