diff --git a/src/main/java/org/opentripplanner/index/FieldErrorInstrumentation.java b/src/main/java/org/opentripplanner/index/FieldErrorInstrumentation.java
index e70b9931ed3..82a7728822e 100644
--- a/src/main/java/org/opentripplanner/index/FieldErrorInstrumentation.java
+++ b/src/main/java/org/opentripplanner/index/FieldErrorInstrumentation.java
@@ -71,7 +71,7 @@ private void setMetadata() {
         MDC.put("router", router.id);
         MDC.put("time", Long.toString(System.currentTimeMillis() - time));
         MDC.put("query", query);
-        MDC.put("arguments", variables.toString());   
+        MDC.put("arguments", variables!=null ? variables.toString() : "");   
         if(headers!=null) {
             MDC.put("userAgent", headers.getFirst(HttpHeaders.USER_AGENT));
             MDC.put("referer", headers.getFirst("referer"));
@@ -96,7 +96,9 @@ public void onEnd(ExecutionResult result) {
                 if(result.getErrors().size() > 0) {
                     StringBuilder errors = new StringBuilder();
                     for(GraphQLError e: result.getErrors()){
-                        errors.append(e.getMessage()).append("\n");
+                        if(e != null) {
+                            errors.append(e.getLocations()).append(e.getErrorType()).append(e.getMessage()).append("\n");
+                        }
                     }
                     MDC.put("errors", errors.toString());
                 }