diff --git a/communicator/ssh/communicator.go b/communicator/ssh/communicator.go
index c8534c16d..7b0fa510f 100644
--- a/communicator/ssh/communicator.go
+++ b/communicator/ssh/communicator.go
@@ -230,7 +230,7 @@ func (c *Communicator) UploadScript(path string, input io.Reader) error {
 	}
 
 	cmd := &remote.Cmd{
-		Command: fmt.Sprintf("chmod 0777 %s", c.connInfo.ScriptPath),
+		Command: fmt.Sprintf("chmod 0777 %s", path),
 	}
 	if err := c.Start(cmd); err != nil {
 		return fmt.Errorf(
@@ -238,6 +238,11 @@ func (c *Communicator) UploadScript(path string, input io.Reader) error {
 				"machine: %s", err)
 	}
 	cmd.Wait()
+	if cmd.ExitStatus != 0 {
+		return fmt.Errorf(
+			"Error chmodding script file to 0777 in remote "+
+				"machine: exit status=%s", cmd.ExitStatus)
+	}
 
 	return nil
 }