From 5d410bddc9b7d353827bc04657a9edaa60ff4c60 Mon Sep 17 00:00:00 2001
From: Henry Huang <henry.s.huang@gmail.com>
Date: Sun, 11 May 2014 00:40:50 +0800
Subject: [PATCH] When unexpected state found in waiting, notify the caller
 func with a correct error message

---
 builder/amazon/common/state.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go
index bab45d5db..4f7d4b11d 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -151,8 +151,8 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) {
 			}
 
 			if !found {
-				fmt.Errorf("unexpected state '%s', wanted target '%s'", currentState, conf.Target)
-				return
+				err := fmt.Errorf("unexpected state '%s', wanted target '%s'", currentState, conf.Target)
+				return nil, err
 			}
 		}