diff --git a/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache
index 30724132edb..28f4861b9b6 100644
--- a/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache
+++ b/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache
@@ -344,7 +344,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling {{operationId}}: unsupported response type"));
         }
 
         return result;
diff --git a/samples/client/petstore/cpprest/api/PetApi.cpp b/samples/client/petstore/cpprest/api/PetApi.cpp
index aa9aab9d89c..d3e337d367f 100644
--- a/samples/client/petstore/cpprest/api/PetApi.cpp
+++ b/samples/client/petstore/cpprest/api/PetApi.cpp
@@ -518,7 +518,7 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling findPetsByTags: unsupported response type"));
         }
 
         return result;
@@ -644,7 +644,7 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling getPetById: unsupported response type"));
         }
 
         return result;
@@ -1005,7 +1005,7 @@ pplx::task<std::shared_ptr<ApiResponse>> PetApi::uploadFile(int64_t petId, utili
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling uploadFile: unsupported response type"));
         }
 
         return result;
diff --git a/samples/client/petstore/cpprest/api/StoreApi.cpp b/samples/client/petstore/cpprest/api/StoreApi.cpp
index 39a3c6a39f7..40a6b8cfb71 100644
--- a/samples/client/petstore/cpprest/api/StoreApi.cpp
+++ b/samples/client/petstore/cpprest/api/StoreApi.cpp
@@ -259,7 +259,7 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling getInventory: unsupported response type"));
         }
 
         return result;
@@ -377,7 +377,7 @@ pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(int64_t orderId)
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling getOrderById: unsupported response type"));
         }
 
         return result;
@@ -513,7 +513,7 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> b
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling placeOrder: unsupported response type"));
         }
 
         return result;
diff --git a/samples/client/petstore/cpprest/api/UserApi.cpp b/samples/client/petstore/cpprest/api/UserApi.cpp
index 669be733361..289295a36b5 100644
--- a/samples/client/petstore/cpprest/api/UserApi.cpp
+++ b/samples/client/petstore/cpprest/api/UserApi.cpp
@@ -616,7 +616,7 @@ pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t usern
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling getUserByName: unsupported response type"));
         }
 
         return result;
@@ -751,7 +751,7 @@ pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, uti
         else
         {
             throw ApiException(500
-                , U("error calling findPetsByStatus: unsupported response type"));
+                , U("error calling loginUser: unsupported response type"));
         }
 
         return result;