diff --git a/main.go b/main.go
index 6d5652b..20ad296 100644
--- a/main.go
+++ b/main.go
@@ -171,7 +171,7 @@ func run(c *cli.Context) error {
 			Proxy: defaultConfig{
 				Key:      c.String("proxy.ssh-key"),
 				KeyPath:  c.String("proxy.key-path"),
-				User:     c.String("proxy.user"),
+				User:     c.String("proxy.username"),
 				Password: c.String("proxy.password"),
 				Server:   c.String("proxy.host"),
 				Port:     c.String("proxy.port"),
diff --git a/plugin.go b/plugin.go
index 961427a..a39da89 100644
--- a/plugin.go
+++ b/plugin.go
@@ -96,14 +96,14 @@ func (p Plugin) Exec() error {
 				p.log(host, "errors:", errStr)
 			}
 
-			if !isTimeout {
-				errChannel <- fmt.Errorf(commandTimeOut)
-			}
-
 			if err != nil {
 				errChannel <- err
 			}
 
+			if !isTimeout {
+				errChannel <- fmt.Errorf(commandTimeOut)
+			}
+
 			wg.Done()
 		}(host)
 	}