diff --git a/src/main/java/org/sablecc/sablecc/GenTokens.java b/src/main/java/org/sablecc/sablecc/GenTokens.java
index eac602079953729a7c63e1c884e295628761d4c7..364f79d2606e8b3ce2e83a5f74b9918e89851acf 100644
--- a/src/main/java/org/sablecc/sablecc/GenTokens.java
+++ b/src/main/java/org/sablecc/sablecc/GenTokens.java
@@ -108,7 +108,10 @@ public class GenTokens extends DepthFirstAdapter
 
         macros.apply(file, "FixedTextToken", new String[] {ids.pkgNameDot, name, processText(text)});
 
-        ids.errorNames.put(node, "'" + text + "'");
+        // Workaround to not output the characters '*/' into comments in the generated code.
+        if (!text.contains("*/")) {
+          ids.errorNames.put(node, "'" + text + "'");
+        }
       }
     }
     catch(IOException e)