diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index d5b9818517a66ddfe46873f48ab1414abaf3f6c4..7db8e679ed44edf0210f5fedfbc086079777941a 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -42,11 +42,6 @@ public class Parser implements IParser
     public Map<PositionedNode, SourcecodeRange> getMapping() { return this.mapping; }
 
     private void checkResult(Object elementToCheck, List<Object> beginNode, List<Object> endNode) {
-        // nodes with no tokens or sub nodes at all may exist
-        if (endNode == null) {
-            return;
-        }
-
         if (elementToCheck instanceof List<?>) {
             /*
              * special case: this is a list of nodes, for example an identifier
@@ -66,11 +61,6 @@ public class Parser implements IParser
         final PositionedNode node = (PositionedNode) elementToCheck;
 
         if (!this.getMapping().containsKey(node)) {
-            // dealing with a one-token element
-            if (beginNode == null) {
-                beginNode = endNode;
-            }
-
             final int begin = findBeginPos(beginNode, node);
             int end = findEndPos(endNode);
             if (end == -1) end = begin;
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index 6719a6735ac79c549e52e5bae145687ceff1d0df..5b6c9a06767bd0516b5aea8d6c45a289aa245661 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -50,11 +50,6 @@ public class Parser implements IParser
     public Map<PositionedNode, SourcecodeRange> getMapping() { return this.mapping; }
 
     private void checkResult(Object elementToCheck, List<Object> beginNode, List<Object> endNode) {
-        // nodes with no tokens or sub nodes at all may exist
-        if (endNode == null) {
-            return;
-        }
-
         if (elementToCheck instanceof List<?>) {
             /*
              * special case: this is a list of nodes, for example an identifier
@@ -74,11 +69,6 @@ public class Parser implements IParser
         final PositionedNode node = (PositionedNode) elementToCheck;
 
         if (!this.getMapping().containsKey(node)) {
-            // dealing with a one-token element
-            if (beginNode == null) {
-                beginNode = endNode;
-            }
-
             final int begin = findBeginPos(beginNode, node);
             int end = findEndPos(endNode);
             if (end == -1) end = begin;