diff --git a/buildengine/build.go b/buildengine/build.go
index 2b4fdd7ac..3a50e0522 100644
--- a/buildengine/build.go
+++ b/buildengine/build.go
@@ -41,6 +41,9 @@ func buildModule(ctx context.Context, projectRootDir string, sch *schema.Schema,
 	}
 
 	logger.Infof("Building module")
+
+	startTime := time.Now()
+
 	switch module.Config.Language {
 	case "go":
 		err = buildGoModule(ctx, projectRootDir, sch, module, filesTransaction)
@@ -70,6 +73,8 @@ func buildModule(ctx context.Context, projectRootDir string, sch *schema.Schema,
 		return errors.Join(errs...)
 	}
 
+	logger.Infof("Module built (%.2fs)", time.Since(startTime).Seconds())
+
 	return nil
 }
 
diff --git a/buildengine/engine.go b/buildengine/engine.go
index 806acc2d6..dbc109e15 100644
--- a/buildengine/engine.go
+++ b/buildengine/engine.go
@@ -729,7 +729,10 @@ func (e *Engine) gatherSchemas(
 		latestModule = moduleMeta{module: module}
 	}
 	for _, dep := range latestModule.module.Dependencies {
-		out[dep] = moduleSchemas[dep]
+		if moduleSchemas[dep] != nil {
+			out[dep] = moduleSchemas[dep]
+		}
+
 		if dep != "builtin" {
 			depModule, ok := e.moduleMetas.Load(dep)
 			// TODO: should we be gathering schemas from dependencies without a module?