diff --git a/tools/aegis4j/build.gradle b/tools/aegis4j/build.gradle
index 3159f96a20..d75bef7964 100644
--- a/tools/aegis4j/build.gradle
+++ b/tools/aegis4j/build.gradle
@@ -35,6 +35,8 @@ dependencies {
     testImplementation "org.yaml:snakeyaml:1.33"
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     testImplementation "io.netty:netty:3.10.5.Final"
+    testImplementation "com.h2database:h2:$h2_version"
+    testImplementation "javax.servlet:javax.servlet-api:${servlet_version}" // Needed to load H2 Web Console
 }
 
 sourceCompatibility = 8
diff --git a/tools/aegis4j/src/main/java/net/gredler/aegis4j/Patcher.java b/tools/aegis4j/src/main/java/net/gredler/aegis4j/Patcher.java
index 84227d9fbb..daf1440a9e 100644
--- a/tools/aegis4j/src/main/java/net/gredler/aegis4j/Patcher.java
+++ b/tools/aegis4j/src/main/java/net/gredler/aegis4j/Patcher.java
@@ -63,6 +63,8 @@ public final class Patcher implements ClassFileTransformer {
                 System.out.println();
             } catch (ClassNotFoundException e) {
                 System.out.println("not present.");
+            } catch (NoClassDefFoundError e) {
+                System.out.println("not present.");
             } catch (UnmodifiableClassException e) {
                 throw new IOException("Problems transforming class", e);
             }
@@ -109,7 +111,6 @@ public final class Patcher implements ClassFileTransformer {
             }
             return clazz.toBytecode();
         } catch (NotFoundException | CannotCompileException | IOException e) {
-            e.printStackTrace();
             return null;
         }
     }
diff --git a/tools/aegis4j/src/test/java/net/gredler/aegis4j/CVE_2018_10054.java b/tools/aegis4j/src/test/java/net/gredler/aegis4j/CVE_2018_10054.java
new file mode 100644
index 0000000000..34e357f78d
--- /dev/null
+++ b/tools/aegis4j/src/test/java/net/gredler/aegis4j/CVE_2018_10054.java
@@ -0,0 +1,31 @@
+/* Copyright (c) 2022, Daniel Gredler. All rights reserved. */
+
+package net.gredler.aegis4j;
+
+import org.h2.server.web.WebServlet;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Tests H2 Web Console blocking.
+ */
+public class CVE_2018_10054 {
+    @AfterAll
+    public static void uninstallAgent() throws Exception {
+        System.clearProperty("aegis4j.additional.args");
+    }
+
+    @Test
+    public void test() throws Exception {
+        TestUtils.installAgent("path=../resources/test/h2-mods.properties");
+        try {
+            new WebServlet();
+            fail("Exception expected");
+        } catch (RuntimeException e) {
+            assertEquals("H2 Console blocked by aegis4j", e.getMessage());
+        }
+    }
+}
diff --git a/tools/aegis4j/src/test/resources/h2-mods.properties b/tools/aegis4j/src/test/resources/h2-mods.properties
new file mode 100644
index 0000000000..0b39eec274
--- /dev/null
+++ b/tools/aegis4j/src/test/resources/h2-mods.properties
@@ -0,0 +1,3 @@
+# format: <feature>.<class-name>.<method-name>=<replacement-code>
+# CVE-2018-10054, CVE-2021-42392, CVE-2018-14335
+H2.org.h2.server.web.WebServlet.WebServlet=throw new java.lang.RuntimeException("H2 Console blocked by aegis4j");
\ No newline at end of file
diff --git a/tools/cliutils/src/main/resources/mods.properties b/tools/cliutils/src/main/resources/mods.properties
index 4738c9be03..071a219c47 100644
--- a/tools/cliutils/src/main/resources/mods.properties
+++ b/tools/cliutils/src/main/resources/mods.properties
@@ -4,6 +4,7 @@
 # Patches the 3 protected methods which InitialContext uses internally to get all Context instances,
 # so that these methods always throw a NoInitialContextException (NICE). As a result, no JNDI lookups
 # are possible.
+# Also: CVE-2022-23221, CVE-2021-42392
 JNDI.javax.naming.InitialContext.getURLOrDefaultInitCtx=throw new javax.naming.NoInitialContextException("JNDI context creation blocked by aegis4j");
 JNDI.javax.naming.InitialContext.getDefaultInitCtx=throw new javax.naming.NoInitialContextException("JNDI context creation blocked by aegis4j");
 # RMI
@@ -63,3 +64,5 @@ KOTLIN.kotlin.io.FilesKt__UtilsKt.createTempFile=throw new java.lang.RuntimeExce
 GUAVA.com.google.common.io.Files.createTempDir=throw new java.lang.RuntimeException("Guava createTempDir blocked by aegis4j");
 # CVE-2019-16869 - HttpObjectDecoder was called HttpMessageDecoder back then
 NETTYHTTP.org.jboss.netty.handler.codec.http.HttpMessageDecoder.HttpMessageDecoder=throw new java.lang.RuntimeException("netty-codec-http HttpMessageDecoder blocked by aegis4j");
+# CVE-2018-10054, CVE-2021-42392, CVE-2018-14335
+H2.org.h2.server.web.WebServlet.WebServlet=throw new java.lang.RuntimeException("H2 Console blocked by aegis4j");
\ No newline at end of file