diff --git a/src/main/java/graphql/execution/preparsed/PreparsedDocumentEntry.java b/src/main/java/graphql/execution/preparsed/PreparsedDocumentEntry.java
index f695a5dae3..9846657418 100644
--- a/src/main/java/graphql/execution/preparsed/PreparsedDocumentEntry.java
+++ b/src/main/java/graphql/execution/preparsed/PreparsedDocumentEntry.java
@@ -3,9 +3,10 @@
 import graphql.GraphQLError;
 import graphql.language.Document;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
+
+import static graphql.Assert.assertNotNull;
+import static java.util.Collections.singletonList;
 
 /**
  * An instance of a preparsed document entry represents the result of a query parse and validation, like
@@ -16,19 +17,19 @@ public class PreparsedDocumentEntry {
     private final List<? extends GraphQLError> errors;
 
     public PreparsedDocumentEntry(Document document) {
-        Objects.requireNonNull(document);
+        assertNotNull(document);
         this.document = document;
         this.errors = null;
     }
 
     public PreparsedDocumentEntry(List<? extends GraphQLError> errors) {
-        Objects.requireNonNull(errors);
+        assertNotNull(errors);
         this.document = null;
         this.errors = errors;
     }
 
     public PreparsedDocumentEntry(GraphQLError error) {
-        this(Collections.singletonList(Objects.requireNonNull(error)));
+        this(singletonList(assertNotNull(error)));
     }
 
     public Document getDocument() {
diff --git a/src/test/groovy/graphql/execution/preparsed/PreparsedDocumentEntryTest.groovy b/src/test/groovy/graphql/execution/preparsed/PreparsedDocumentEntryTest.groovy
index 42b1586dcd..88f952af98 100644
--- a/src/test/groovy/graphql/execution/preparsed/PreparsedDocumentEntryTest.groovy
+++ b/src/test/groovy/graphql/execution/preparsed/PreparsedDocumentEntryTest.groovy
@@ -1,5 +1,6 @@
 package graphql.execution.preparsed
 
+import graphql.AssertException
 import graphql.GraphQLError
 import graphql.InvalidSyntaxError
 import graphql.language.Document
@@ -21,12 +22,12 @@ class PreparsedDocumentEntryTest extends Specification {
         docEntry.errors == null
     }
 
-    def "Ensure a null document throws NPE"() {
+    def "Ensure a null document throws Exception"() {
         when:
         new PreparsedDocumentEntry((Document) null)
 
         then:
-        thrown(NullPointerException)
+        thrown(AssertException)
     }
 
     def "Ensure a non-null errors returns"() {
@@ -42,20 +43,20 @@ class PreparsedDocumentEntryTest extends Specification {
         docEntry.errors == errors
     }
 
-    def "Ensure a null errors throws NPE"() {
+    def "Ensure a null errors throws Exception"() {
         when:
         new PreparsedDocumentEntry((List<GraphQLError>) null)
 
         then:
-        thrown(NullPointerException)
+        thrown(AssertException)
     }
 
-    def "Ensure a null error throws NPE"() {
+    def "Ensure a null error throws Exception"() {
         when:
         new PreparsedDocumentEntry((GraphQLError) null)
 
         then:
-        thrown(NullPointerException)
+        thrown(AssertException)
     }