diff --git a/core/test_run_utils.py b/core/test_run_utils.py
index c06fd70..51e6435 100644
--- a/core/test_run_utils.py
+++ b/core/test_run_utils.py
@@ -186,8 +186,6 @@ TestRun.setup = __setup
 
 @classmethod
 def __makereport(cls, item, call, res):
-    if cls.LOGGER is None:
-        return None
     cls.outcome = res.outcome
     step_info = {
         'result': res.outcome,
@@ -213,7 +211,7 @@ def __makereport(cls, item, call, res):
     if res.outcome == "skipped":
         cls.LOGGER.skip("Test skipped.")
 
-    if res.when == "call" and cls.LOGGER.get_result() == BaseLogResult.FAILED:
+    if res.when in ["call", "setup"] and cls.LOGGER.get_result() >= BaseLogResult.FAILED:
         res.outcome = "failed"
         # To print additional message in final test report, assign it to res.longrepr