diff --git a/builder/vagrant/driver_2_2.go b/builder/vagrant/driver_2_2.go
index c1df9ea98..cb2243ad5 100644
--- a/builder/vagrant/driver_2_2.go
+++ b/builder/vagrant/driver_2_2.go
@@ -154,8 +154,10 @@ func (d *Vagrant_2_2_Driver) SSHConfig(id string) (*VagrantSSHConfig, error) {
 	sshConf := &VagrantSSHConfig{}
 
 	stdout, stderr, err := d.vagrantCmd(args...)
-	if stderr != "" {
-		err := fmt.Errorf("ssh-config command returned error: %s", stderr)
+	if err != nil {
+		if stderr != "" {
+			err = fmt.Errorf("ssh-config command returned errors: %s", stderr)
+		}
 		return sshConf, err
 	}
 	lines := strings.Split(stdout, "\n")