diff --git a/pkg/volume/gcepd/attacher.go b/pkg/volume/gcepd/attacher.go
index 2a6349a511263..c97be9edcde0e 100644
--- a/pkg/volume/gcepd/attacher.go
+++ b/pkg/volume/gcepd/attacher.go
@@ -242,8 +242,9 @@ func (attacher *gcePersistentDiskAttacher) WaitForAttach(spec *volume.Spec, devi
 		id, err := getDiskID(pdName, exec)
 		if err != nil {
 			klog.Errorf("WaitForAttach (windows) failed with error %s", err)
+			return "", err
 		}
-		return id, err
+		return id, nil
 	}
 
 	partition := ""