diff --git a/services/runcommand/model_create_command_payload.go b/services/runcommand/model_create_command_payload.go
index d7effe79b..a7451afdf 100644
--- a/services/runcommand/model_create_command_payload.go
+++ b/services/runcommand/model_create_command_payload.go
@@ -46,7 +46,7 @@ func NewCreateCommandPayloadWithDefaults() *CreateCommandPayload {
 
 // GetCommandTemplateName returns the CommandTemplateName field value
 func (o *CreateCommandPayload) GetCommandTemplateName() *string {
-	if o == nil {
+	if o == nil || IsNil(o.CommandTemplateName) {
 		var ret *string
 		return ret
 	}
diff --git a/services/runcommand/model_error_response.go b/services/runcommand/model_error_response.go
index 5c85b11fb..92ae87e8e 100644
--- a/services/runcommand/model_error_response.go
+++ b/services/runcommand/model_error_response.go
@@ -50,7 +50,7 @@ func NewErrorResponseWithDefaults() *ErrorResponse {
 
 // GetMessage returns the Message field value
 func (o *ErrorResponse) GetMessage() *string {
-	if o == nil {
+	if o == nil || IsNil(o.Message) {
 		var ret *string
 		return ret
 	}
@@ -74,7 +74,7 @@ func (o *ErrorResponse) SetMessage(v *string) {
 
 // GetStatus returns the Status field value
 func (o *ErrorResponse) GetStatus() *string {
-	if o == nil {
+	if o == nil || IsNil(o.Status) {
 		var ret *string
 		return ret
 	}