diff --git a/config/agent.go b/config/agent.go
index 3fd969ec4..06dc1e551 100644
--- a/config/agent.go
+++ b/config/agent.go
@@ -175,7 +175,7 @@ func (c *AgentConfig) Validate() error {
 	}
 	if c.Hostname == "" {
 		if err := c.acquireHostname(); err != nil {
-			return ErrMissingHostname
+			return err
 		}
 	}
 	return nil
@@ -207,6 +207,9 @@ func (c *AgentConfig) acquireHostname() error {
 	if err != nil || c.Hostname == "" {
 		c.Hostname, err = os.Hostname()
 	}
+	if c.Hostname == "" {
+		err = ErrMissingHostname
+	}
 	return err
 }