diff --git a/src/main/java/com/mojang/serialization/JsonOps.java b/src/main/java/com/mojang/serialization/JsonOps.java
index cb9ee2e6..d46b290b 100644
--- a/src/main/java/com/mojang/serialization/JsonOps.java
+++ b/src/main/java/com/mojang/serialization/JsonOps.java
@@ -44,7 +44,7 @@ public <U> U convertTo(final DynamicOps<U> outOps, final JsonElement input) {
         if (input instanceof JsonArray) {
             return convertList(outOps, input);
         }
-        if (input instanceof JsonNull) {
+        if (input == null || input instanceof JsonNull) {
             return outOps.empty();
         }
         final JsonPrimitive primitive = input.getAsJsonPrimitive();