diff --git a/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java
index a501a023b53..9851ac35469 100644
--- a/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java
+++ b/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java
@@ -19,11 +19,11 @@ public class TestToolSyntaxErrors {
 		"grammar A;\n" +
 		"",
 		// YIELDS
-		"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no rules\n",
+		"error(" + ErrorType.NO_RULES.code + "): A.g4:1:0: grammar A has no rules\n",
 
 		"lexer grammar A;\n" +
 		"",
-		"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no rules\n",
+		"error(" + ErrorType.NO_RULES.code + "): A.g4:1:6: grammar A has no rules\n",
 
 		"A;",
 		"error(" + ErrorType.SYNTAX_ERROR.code + "): A.g4:1:0: syntax error: 'A' came as a complete surprise to me\n",
diff --git a/tool/src/org/antlr/v4/semantics/BasicSemanticChecks.java b/tool/src/org/antlr/v4/semantics/BasicSemanticChecks.java
index b0987088c2a..707eaebd801 100644
--- a/tool/src/org/antlr/v4/semantics/BasicSemanticChecks.java
+++ b/tool/src/org/antlr/v4/semantics/BasicSemanticChecks.java
@@ -322,8 +322,7 @@ void checkNumRules(GrammarAST rulesNode) {
 		if ( rulesNode.getChildCount()==0 ) {
 			GrammarAST root = (GrammarAST)rulesNode.getParent();
 			GrammarAST IDNode = (GrammarAST)root.getChild(0);
-			g.tool.errMgr.grammarError(ErrorType.NO_RULES, g.fileName,
-					null, IDNode.getText(), g);
+			g.tool.errMgr.grammarError(ErrorType.NO_RULES, g.fileName, root.token, IDNode.getText(), g);
 		}
 	}