diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go
index 9d982b10b..a2ef04952 100644
--- a/builder/amazon/common/step_get_password.go
+++ b/builder/amazon/common/step_get_password.go
@@ -28,7 +28,7 @@ func (s *StepGetPassword) Run(state multistep.StateBag) multistep.StepAction {
 	image := state.Get("source_image").(*ec2.Image)
 
 	// Skip if we're not Windows...
-	if *image.Platform != "windows" {
+	if image.Platform == nil || *image.Platform != "windows" {
 		log.Printf("[INFO] Not Windows, skipping get password...")
 		return multistep.ActionContinue
 	}