diff --git a/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java b/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java
index 4d2041bff10..2cee202be31 100644
--- a/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java
+++ b/src/main/java/org/opentripplanner/index/IndexGraphQLSchema.java
@@ -2199,12 +2199,12 @@ private Object getObject(String idString) {
                 .argument(GraphQLArgument.newArgument()
                     .name("lat")
                     .description("Latitude of the location")
-                    .type(Scalars.GraphQLFloat)
+                    .type(new GraphQLNonNull(Scalars.GraphQLFloat))
                     .build())
                 .argument(GraphQLArgument.newArgument()
                     .name("lon")
                     .description("Longitude of the location")
-                    .type(Scalars.GraphQLFloat)
+                    .type(new GraphQLNonNull(Scalars.GraphQLFloat))
                     .build())
                 .argument(GraphQLArgument.newArgument()
                     .name("maxDistance")