diff --git a/hazelcast/include/hazelcast/client/exception/ProtocolExceptions.h b/hazelcast/include/hazelcast/client/exception/ProtocolExceptions.h
index c560e42314..42b168f36d 100644
--- a/hazelcast/include/hazelcast/client/exception/ProtocolExceptions.h
+++ b/hazelcast/include/hazelcast/client/exception/ProtocolExceptions.h
@@ -123,6 +123,8 @@ namespace hazelcast {
             DEFINE_EXCEPTION_CLASS(StaleSequenceException, protocol::STALE_SEQUENCE, true);
             DEFINE_EXCEPTION_CLASS(TargetDisconnectedException, protocol::TARGET_DISCONNECTED, true);
             DEFINE_EXCEPTION_CLASS(TopicOverloadException, protocol::TOPIC_OVERLOAD, true);
+
+            DEFINE_EXCEPTION_CLASS(TopologyChangedException, protocol::TOPOLOGY_CHANGED, true);
             DEFINE_EXCEPTION_CLASS(TransactionException, protocol::TRANSACTION, true);
             DEFINE_EXCEPTION_CLASS(TransactionNotActiveException, protocol::TRANSACTION_NOT_ACTIVE, true);
             DEFINE_EXCEPTION_CLASS(TransactionTimedOutException, protocol::TRANSACTION_TIMED_OUT, true);
@@ -134,6 +136,20 @@ namespace hazelcast {
             DEFINE_EXCEPTION_CLASS(WANReplicationQueueFullException, protocol::WAN_REPLICATION_QUEUE_FULL, true);
             DEFINE_EXCEPTION_CLASS(ServiceNotFoundException, protocol::SERVICE_NOT_FOUND, true);
 
+            DEFINE_EXCEPTION_CLASS(StaleTaskIdException, protocol::STALE_TASK_ID, true);
+
+            DEFINE_EXCEPTION_CLASS(DuplicateTaskException, protocol::DUPLICATE_TASK, true);
+
+            DEFINE_EXCEPTION_CLASS(StaleTaskException, protocol::STALE_TASK, true);
+
+            DEFINE_EXCEPTION_CLASS(LocalMemberResetException, protocol::LOCAL_MEMBER_RESET, true);
+
+            DEFINE_EXCEPTION_CLASS(IndeterminateOperationStateException, protocol::INDETERMINATE_OPERATION_STATE, true);
+
+            DEFINE_EXCEPTION_CLASS(NodeIdOutOfRangeException, protocol::FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION, true);
+
+            DEFINE_EXCEPTION_CLASS(MutationDisallowedException, protocol::MUTATION_DISALLOWED_EXCEPTION, true);
+
             class HAZELCAST_API RetryableHazelcastException : public HazelcastException {
             public:
                 RetryableHazelcastException(const std::string &source, const std::string &message,
@@ -172,12 +188,13 @@ namespace hazelcast {
 
             /** List of Retryable exceptions **/
             DEFINE_RETRYABLE_EXCEPTION_CLASS(CallerNotMemberException, protocol::CALLER_NOT_MEMBER);
-            DEFINE_RETRYABLE_EXCEPTION_CLASS(TopologyChangedException, protocol::TOPOLOGY_CHANGED);
             DEFINE_RETRYABLE_EXCEPTION_CLASS(PartitionMigratingException, protocol::PARTITION_MIGRATING);
             DEFINE_RETRYABLE_EXCEPTION_CLASS(RetryableIOException, protocol::RETRYABLE_IO);
             DEFINE_RETRYABLE_EXCEPTION_CLASS(TargetNotMemberException, protocol::TARGET_NOT_MEMBER);
             DEFINE_RETRYABLE_EXCEPTION_CLASS(WrongTargetException, protocol::WRONG_TARGET);
 
+            DEFINE_RETRYABLE_EXCEPTION_CLASS(TargetNotReplicaException, protocol::TARGET_NOT_REPLICA_EXCEPTION);
+
             class MemberLeftException : public ExecutionException, public RetryableHazelcastException {
             public:
                 MemberLeftException(const std::string &source, const std::string &message, const std::string &details,
diff --git a/hazelcast/include/hazelcast/client/protocol/ClientProtocolErrorCodes.h b/hazelcast/include/hazelcast/client/protocol/ClientProtocolErrorCodes.h
index 3a29b649e8..897c6351e4 100644
--- a/hazelcast/include/hazelcast/client/protocol/ClientProtocolErrorCodes.h
+++ b/hazelcast/include/hazelcast/client/protocol/ClientProtocolErrorCodes.h
@@ -104,10 +104,18 @@ namespace hazelcast {
                 STACK_OVERFLOW_ERROR = 77,
                 NATIVE_OUT_OF_MEMORY_ERROR = 78,
                 SERVICE_NOT_FOUND = 79,
+                STALE_TASK_ID = 80,
+                DUPLICATE_TASK = 81,
+                STALE_TASK = 82,
+                LOCAL_MEMBER_RESET = 83,
+                INDETERMINATE_OPERATION_STATE = 84,
+                FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION = 85,
+                TARGET_NOT_REPLICA_EXCEPTION = 86,
+                MUTATION_DISALLOWED_EXCEPTION = 87,
                 CONSISTENCY_LOST = 88,
 
                 // Non protocol exceptions, thrown locally
-                HAZELCAST_CLIENT_OFFLINE = -1,
+                        HAZELCAST_CLIENT_OFFLINE = -1,
                 UNKNOWN_HOST = -2,
                 FUTURE_UNINITIALIZED = -3,
                 UNEXPECTED_MESSAGE_TYPE = -4