cmd: Emit error if reload cannot find a config to loadv2.0.0-beta.13

1 files changed, 5 insertions, 2 deletions

diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go
index 0067d3b60..8d522584d 100644
--- a/cmd/commandfuncs.go
+++ b/cmd/commandfuncs.go
@@ -171,7 +171,7 @@ func cmdRun(fl Flags) (int, error) {
 	}
 	// we don't use 'else' here since this value might have been changed in 'if' block; i.e. not mutually exclusive
 	if !runCmdResumeFlag {
-		config, err = loadConfig(runCmdConfigFlag, runCmdConfigAdapterFlag)
+		config, _, err = loadConfig(runCmdConfigFlag, runCmdConfigAdapterFlag)
 		if err != nil {
 			return caddy.ExitCodeFailedStartup, err
 		}
@@ -265,10 +265,13 @@ func cmdReload(fl Flags) (int, error) {
 	reloadCmdAddrFlag := fl.String("address")
 
 	// get the config in caddy's native format
-	config, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag)
+	config, hasConfig, err := loadConfig(reloadCmdConfigFlag, reloadCmdConfigAdapterFlag)
 	if err != nil {
 		return caddy.ExitCodeFailedStartup, err
 	}
+	if !hasConfig {
+		return caddy.ExitCodeFailedStartup, fmt.Errorf("no config file to load")
+	}
 
 	// get the address of the admin listener and craft endpoint URL
 	adminAddr := reloadCmdAddrFlag