diff --git a/scenario_runner.py b/scenario_runner.py
index 5f0e8e79a..f3206e2b7 100755
--- a/scenario_runner.py
+++ b/scenario_runner.py
@@ -200,9 +200,9 @@ def _cleanup(self):
             except RuntimeError:
                 sys.exit(-1)
 
-        self.manager.cleanup()
+        # self.manager.cleanup()
 
-        CarlaDataProvider.cleanup()
+        # CarlaDataProvider.cleanup()
 
         for i, _ in enumerate(self.ego_vehicles):
             if self.ego_vehicles[i]:
@@ -660,4 +660,4 @@ def main():
 
 
 if __name__ == "__main__":
-    sys.exit(main())
\ No newline at end of file
+    sys.exit(main())
diff --git a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py
index 56b03de0a..cd1a20fe3 100644
--- a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py
+++ b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py
@@ -4593,7 +4593,9 @@ def update(self):
                 new_status = py_trees.common.Status.SUCCESS
         except:  # pylint: disable=bare-except
             print("ActorSource unable to spawn actor")
-
+            new_status = py_trees.common.Status.FAILURE
+        finally:
+            return new_status
 
 class SwitchWrongDirectionTest(AtomicBehavior):