diff --git a/src/graph/Matching.cpp b/src/graph/Matching.cpp
index 282ed20207f3c91637b8778c77ed1c97d11b0ee9..2fcea4c2448dcb24300c0c1478882c0dbb5c75b8 100644
--- a/src/graph/Matching.cpp
+++ b/src/graph/Matching.cpp
@@ -78,9 +78,7 @@ std::set<Aidge::SinglePassGraphMatching::MatchingResult> Aidge::SinglePassGraphM
     }
 
     removeLeadingWhitespace(ctx.query);
-    if (!ctx.query.empty()) {
-        Log::warn("Syntax error, unable to parse remaining query: {}", ctx.query);
-    }
+    AIDGE_ASSERT(ctx.query.empty(), "Syntax error, unable to parse remaining query: {}", ctx.query);
 
     if (disjoint) {
         matches = filterLonguestDisjoint(matches);
@@ -106,9 +104,7 @@ Aidge::SinglePassGraphMatching::MatchingResult Aidge::SinglePassGraphMatching::m
     }
 
     removeLeadingWhitespace(ctx.query);
-    if (!ctx.query.empty()) {
-        Log::warn("Syntax error, unable to parse remaining query: {}", ctx.query);
-    }
+    AIDGE_ASSERT(ctx.query.empty(), "Syntax error, unable to parse remaining query: {}", ctx.query);
 
     AIDGE_INTERNAL_ASSERT(matches.size() <= 1);
     return (!matches.empty()) ? *matches.begin() : MatchingResult();