diff --git a/systemverilog-plugin/uhdmsurelogastfrontend.cc b/systemverilog-plugin/uhdmsurelogastfrontend.cc
index 82f04e4..1f8472a 100644
--- a/systemverilog-plugin/uhdmsurelogastfrontend.cc
+++ b/systemverilog-plugin/uhdmsurelogastfrontend.cc
@@ -70,10 +70,10 @@
     if (noFErrors == false) {
         noFatalErrors = false;
     }
-    if ((!noFatalErrors) || (!success))
+    if ((!noFatalErrors) || (!success) || (errors->getErrorStats().nbError))
         codedReturn |= 1;
     if (codedReturn) {
-        log_error("Encoraged fatal error when executing Surelog. Aborting!\n");
+        log_error("Error when parsing design. Aborting!\n");
     }
     return the_design;
 }