diff --git a/src/object.cpp b/src/object.cpp
index e310262..b9b9612 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -170,7 +170,7 @@ const ObjectBase* Evaluate(ExecExpr& exp, bool* err)
     exp.erase(pr);
 
     // Error handling
-    if(!errl.empty())
+    if( res==nullptr || res->isError() )
     {
      const struct grammatic_location& loc=cse->Location();
      *err=true; // Raise error flag