diff --git a/CHANGELOG.md b/CHANGELOG.md
index 620975ec7..c91f2d74d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 1.17.0 (Unreleased)
-## 1.17.0 (September 27, 2024)
+
+BUG FIXES:
+
+* provider: Prevent crash when create waiter returns a nil progress event ([#2027](https://github.com/hashicorp/terraform-provider-awscc/pull/2027))
 
 ## 1.16.1 (September 27, 2024)
 
diff --git a/internal/generic/resource.go b/internal/generic/resource.go
index 7ebe244ac..750a2856e 100644
--- a/internal/generic/resource.go
+++ b/internal/generic/resource.go
@@ -394,7 +394,10 @@ func (r *genericResource) Create(ctx context.Context, request resource.CreateReq
 
 	err = waiter.Wait(ctx, &cloudcontrol.GetResourceRequestStatusInput{RequestToken: output.ProgressEvent.RequestToken}, r.createTimeout)
 
-	id := aws.ToString(progressEvent.Identifier)
+	var id string
+	if progressEvent != nil {
+		id = aws.ToString(progressEvent.Identifier)
+	}
 
 	if err != nil {
 		response.Diagnostics.Append(ServiceOperationWaiterErrorDiag("Cloud Control API", "CreateResource", err))