diff --git a/analyzer/resolution.cpp b/analyzer/resolution.cpp
index 14842ad..9ad7502 100644
--- a/analyzer/resolution.cpp
+++ b/analyzer/resolution.cpp
@@ -43,7 +43,13 @@
     }
     else
     {
-        io_sd.addGuard(std::make_shared<Guard>(entityPath, iv_guard));
+        Guard::Type guard = Guard::NONE;
+        if (iv_guard)
+        {
+            guard = io_sd.queryCheckstop() ? Guard::FATAL : Guard::NON_FATAL;
+        }
+
+        io_sd.addGuard(std::make_shared<Guard>(entityPath, guard));
     }
 }