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
 			}
 		}