diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6a964cb8..5271dc3bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
   - **Feature:** 
       - Improved nil-safety
       - subscription products contain the plan id
+- `modelserving` [v0.2.2](services/modelserving/CHANGELOG.md#v022-2025-05-02)
+  - **Feature:** Improved nil-safety
 - `mongodbflex`: [1.0.0](services/mongodbflex/CHANGELOG.md#v100-2025-05-02)
   - **Breaking Change:** Introduce typed enum constants for status attributes
 - `git`: [v0.3.2](services/git/CHANGELOG.md#v032-2025-05-02)
diff --git a/services/modelserving/CHANGELOG.md b/services/modelserving/CHANGELOG.md
index 2919d162a..c82f179a6 100644
--- a/services/modelserving/CHANGELOG.md
+++ b/services/modelserving/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.2.2 (2025-05-02)
+- **Feature:** Improved nil-safety
+
 ## v0.2.1 (2025-03-19)
 - **Internal:** Backwards compatible change to generated code
 
diff --git a/services/modelserving/api_default_test.go b/services/modelserving/api_default_test.go
index dfa914ebc..2e820a696 100644
--- a/services/modelserving/api_default_test.go
+++ b/services/modelserving/api_default_test.go
@@ -26,7 +26,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService CreateToken", func(t *testing.T) {
 		_apiUrlPath := "/v1/projects/{projectId}/regions/{regionId}/tokens"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		projectIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"projectId"+"}", url.PathEscape(ParameterValueToString(projectIdValue, "projectId")), -1)
@@ -81,7 +81,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService DeleteToken", func(t *testing.T) {
 		_apiUrlPath := "/v1/projects/{projectId}/regions/{regionId}/tokens/{tId}"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		projectIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"projectId"+"}", url.PathEscape(ParameterValueToString(projectIdValue, "projectId")), -1)
@@ -139,7 +139,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService GetChatModel", func(t *testing.T) {
 		_apiUrlPath := "/v1/regions/{regionId}/chat/models/{modelId}"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		modelIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"modelId"+"}", url.PathEscape(ParameterValueToString(modelIdValue, "modelId")), -1)
@@ -194,7 +194,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService GetEmbeddingModel", func(t *testing.T) {
 		_apiUrlPath := "/v1/regions/{regionId}/embedding/models/{modelId}"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		modelIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"modelId"+"}", url.PathEscape(ParameterValueToString(modelIdValue, "modelId")), -1)
@@ -249,7 +249,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService GetToken", func(t *testing.T) {
 		_apiUrlPath := "/v1/projects/{projectId}/regions/{regionId}/tokens/{tId}"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		projectIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"projectId"+"}", url.PathEscape(ParameterValueToString(projectIdValue, "projectId")), -1)
@@ -307,7 +307,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService ListModels", func(t *testing.T) {
 		_apiUrlPath := "/v1/regions/{regionId}/models"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 
 		testDefaultApiServeMux := http.NewServeMux()
@@ -359,7 +359,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService ListTokens", func(t *testing.T) {
 		_apiUrlPath := "/v1/projects/{projectId}/regions/{regionId}/tokens"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		projectIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"projectId"+"}", url.PathEscape(ParameterValueToString(projectIdValue, "projectId")), -1)
@@ -414,7 +414,7 @@ func Test_modelserving_DefaultApiService(t *testing.T) {
 
 	t.Run("Test DefaultApiService PartialUpdateToken", func(t *testing.T) {
 		_apiUrlPath := "/v1/projects/{projectId}/regions/{regionId}/tokens/{tId}"
-		regionIdValue := "regionId"
+		regionIdValue := "regionId-value"
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"regionId"+"}", url.PathEscape(ParameterValueToString(regionIdValue, "regionId")), -1)
 		projectIdValue := uuid.NewString()
 		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"projectId"+"}", url.PathEscape(ParameterValueToString(projectIdValue, "projectId")), -1)
diff --git a/services/modelserving/client.go b/services/modelserving/client.go
index ab9ca0c4c..5beb9b62a 100644
--- a/services/modelserving/client.go
+++ b/services/modelserving/client.go
@@ -308,7 +308,7 @@ func (c *APIClient) prepareRequest(
 	var body *bytes.Buffer
 
 	// Detect postBody type and post.
-	if postBody != nil {
+	if !IsNil(postBody) {
 		contentType := headerParams["Content-Type"]
 		if contentType == "" {
 			contentType = detectContentType(postBody)