diff --git a/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractCreatorMojo.java b/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractCreatorMojo.java
index 918db3c351d..931e28a8902 100644
--- a/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractCreatorMojo.java
+++ b/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractCreatorMojo.java
@@ -18,6 +18,7 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -38,6 +39,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
@@ -306,7 +308,7 @@ protected String determinePackageName(Optional<ServiceProvider<ModuleComponent>>
 
         if (persistIt) {
             // record it to scratch file for later consumption (during test build for example)
-            saveAppPackageName(packageName);
+            saveAppPackageName(packageName, getLog());
         }
 
         return packageName;
@@ -326,7 +328,10 @@ protected Optional<String> loadAppPackageName() {
      *
      * @param packageName the package name
      */
-    protected void saveAppPackageName(String packageName) {
+    protected void saveAppPackageName(String packageName, Log logger) {
+        if ("unnamed".equals(packageName)) {
+            logger.debug("Errors: " + Arrays.toString(Thread.currentThread().getStackTrace()));
+        }
         ModuleUtils.saveAppPackageName(getPicoScratchDir().toPath(), packageName);
     }
 
diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java b/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
index 21fb2de96c2..f6285e23c50 100644
--- a/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
+++ b/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
@@ -31,6 +31,7 @@
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -370,7 +371,11 @@ Optional<Path> codegenModuleInfoFilerOut(ModuleInfoDescriptor newDeltaDescriptor
         }
 
         if (!newDeltaDescriptor.isUnnamed()) {
-            saveAppPackageName(scratchBaseOutputPath, normalizedBaseModuleName(newDeltaDescriptor.name()));
+            String name = normalizedBaseModuleName(newDeltaDescriptor.name());
+            if (name.equals("unnamed")) {
+                messager.debug("Errors: name " + Arrays.toString(Thread.currentThread().getStackTrace()));
+            }
+            saveAppPackageName(scratchBaseOutputPath, name);
         }
 
         return filePath;
diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/ModuleUtils.java b/pico/tools/src/main/java/io/helidon/pico/tools/ModuleUtils.java
index 8d64aad23d3..36315ebfd7f 100644
--- a/pico/tools/src/main/java/io/helidon/pico/tools/ModuleUtils.java
+++ b/pico/tools/src/main/java/io/helidon/pico/tools/ModuleUtils.java
@@ -24,7 +24,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -358,7 +357,7 @@ public static Path toBasePath(String sourcePath) {
         if (pos < 0) {
             throw new ToolsException("Invalid source path: " + sourcePath);
         }
-        return Objects.requireNonNull(Path.of(path.substring(0, pos)));
+        return Objects.requireNonNull(Path.of(sourcePath.substring(0, pos)));
     }
 
     /**