diff --git a/command/daemon/config.go b/command/daemon/config.go
index c2309d0..390d45d 100644
--- a/command/daemon/config.go
+++ b/command/daemon/config.go
@@ -143,6 +143,9 @@ func fromEnviron() (Config, error) {
 	if err != nil {
 		return config, err
 	}
+	if config.Runner.Environ == nil {
+		config.Runner.Environ = map[string]string{}
+	}
 	if config.Runner.Name == "" {
 		config.Runner.Name, _ = os.Hostname()
 	}