diff --git a/configs/configupgrade/upgrade.go b/configs/configupgrade/upgrade.go
index 85fd580f9b..e2236a6c1b 100644
--- a/configs/configupgrade/upgrade.go
+++ b/configs/configupgrade/upgrade.go
@@ -35,11 +35,11 @@ func (u *Upgrader) Upgrade(input ModuleSources, dir string) (ModuleSources, tfdi
 	var diags tfdiags.Diagnostics
 
 	an, err := u.analyze(input)
-	an.ModuleDir = dir
 	if err != nil {
 		diags = diags.Append(err)
 		return ret, diags
 	}
+	an.ModuleDir = dir
 
 	for name, src := range input {
 		ext := fileExt(name)