diff --git a/src/parser_yang.c b/src/parser_yang.c
index 7780b6c..968bd8e 100644
--- a/src/parser_yang.c
+++ b/src/parser_yang.c
@@ -4796,7 +4796,7 @@
     } else if (kw != YANG_SUBMODULE) {
         LOGVAL_YANG(context, LYVE_SYNTAX, "Invalid keyword \"%s\", expected \"module\" or \"submodule\".",
                ly_stmt2str(kw));
-        ret = LY_EINVAL;
+        ret = LY_EVALID;
         goto cleanup;
     }
 
@@ -4816,6 +4816,7 @@
         LOGVAL_YANG(context, LYVE_SYNTAX, "Invalid character sequence \"%.*s\", expected end-of-file.",
                word_len, word);
         free(buf);
+        ret = LY_EVALID;
         goto cleanup;
     }
     assert(!buf);
@@ -4851,7 +4852,7 @@
     } else if (kw != YANG_MODULE) {
         LOGVAL_YANG(context, LYVE_SYNTAX, "Invalid keyword \"%s\", expected \"module\" or \"submodule\".",
                ly_stmt2str(kw));
-        ret = LY_EINVAL;
+        ret = LY_EVALID;
         goto cleanup;
     }
 
@@ -4872,6 +4873,7 @@
         LOGVAL_YANG(context, LYVE_SYNTAX, "Invalid character sequence \"%.*s\", expected end-of-file.",
                word_len, word);
         free(buf);
+        ret = LY_EVALID;
         goto cleanup;
     }
     assert(!buf);