diff --git a/src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpecHelper.kt b/src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpecHelper.kt
index 158fc825..8e27e7e2 100644
--- a/src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpecHelper.kt
+++ b/src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpecHelper.kt
@@ -259,7 +259,7 @@ class Query : GraphQLQueryResolver, ListListResolver<String>() {
     }
 
     fun itemsWithOptionalInput(input: ItemSearchInput?) = if (input == null) items else items(input)
-    fun itemsWithOptionalInputExplicit(input: Optional<ItemSearchInput>) = if (input.isPresent) items(input.get()) else items
+    fun itemsWithOptionalInputExplicit(input: Optional<ItemSearchInput>?) = if (input?.isPresent == true) items(input.get()) else items
     fun enumInputType(type: Type) = type
     fun customScalarMapInputType(customScalarMap: Map<String, Any>) = customScalarMap
     fun itemWithGenericProperties() = ItemWithGenericProperties(listOf("A", "B"))