diff --git a/commons/src/main/java/org/archive/net/webdriver/BiDiJson.java b/commons/src/main/java/org/archive/net/webdriver/BiDiJson.java
index 7b9b6bc0..a68fa20b 100644
--- a/commons/src/main/java/org/archive/net/webdriver/BiDiJson.java
+++ b/commons/src/main/java/org/archive/net/webdriver/BiDiJson.java
@@ -111,7 +111,7 @@ class BiDiJson {
     @SuppressWarnings("unchecked")
     static <T> T fromJson(Object value, Class<T> type) {
         try {
-            if (value == JSONObject.NULL) {
+            if (value == JSONObject.NULL || type == Void.class) {
                 return null;
             }
             if (value == null || type.isPrimitive() || type.isAssignableFrom(value.getClass())) {