1 files changed, 7 insertions, 5 deletions
diff --git a/src/runtime/java/org/grammaticalframework/pgf/Parser.java b/src/runtime/java/org/grammaticalframework/pgf/Parser.java
index c8ec3663e..ba97198ea 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/Parser.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/Parser.java
@@ -41,11 +41,13 @@ class Parser implements Iterable<ExprProb> {
 	{
 		Pool pool = new Pool();
 		long callbacksRef = newCallbacksMap(concr, pool);
-		for (Map.Entry<String, LiteralCallback> entry : callbacks.entrySet()) {
-			addLiteralCallback(concr, callbacksRef, 
-					           entry.getKey(), entry.getValue(),
-					           pool);
-		} 
+		if (callbacks != null) {
+			for (Map.Entry<String, LiteralCallback> entry : callbacks.entrySet()) {
+				addLiteralCallback(concr, callbacksRef, 
+								   entry.getKey(), entry.getValue(),
+								   pool);
+			}
+		}
 		return parseWithHeuristics(concr, startCat, s, heuristics, callbacksRef, pool);
 	}