diff --git a/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java b/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java
index e45235d4e..70688cfff 100644
--- a/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java
+++ b/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java
@@ -30,6 +30,7 @@ import org.gradle.tooling.ConfigurableLauncher;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -70,7 +71,10 @@ public class Main {
         if (client != null) {
             try {
                 final var args = client.getBuildArguments().get();
+                args.removeIf(Objects::isNull);
                 args.removeIf(String::isBlank);
+
+                LOG.debug("Arguments from tooling client:", args);
                 launcher.addArguments(args);
             } catch (Throwable e) {
                 LOG.error("Unable to get build arguments from tooling client", e);
diff --git a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar
index 756be65cd..f3afc55c7 100644
Binary files a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar and b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar differ