diff --git a/packer/build.go b/packer/build.go
index da09ccbc2..5c4815d28 100644
--- a/packer/build.go
+++ b/packer/build.go
@@ -47,6 +47,7 @@ func (b *coreBuild) Prepare(ui Ui) (err error) {
 	err = b.builder.Prepare(b.builderConfig)
 	if err != nil {
 		log.Printf("Build '%s' prepare failure: %s\n", b.name, err)
+		return
 	}
 
 	// Prepare the provisioners
diff --git a/packer/rpc/build.go b/packer/rpc/build.go
index ebaa30628..c0cd5fde4 100644
--- a/packer/rpc/build.go
+++ b/packer/rpc/build.go
@@ -41,8 +41,8 @@ func (b *build) Prepare(ui packer.Ui) (err error) {
 	RegisterUi(server, ui)
 	args := &BuildPrepareArgs{serveSingleConn(server)}
 
-	if err := b.client.Call("Build.Prepare", args, &err); err != nil {
-		panic(err)
+	if cerr := b.client.Call("Build.Prepare", args, &err); cerr != nil {
+		panic(cerr)
 	}
 
 	return