diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ClickHouseException.java b/client-v2/src/main/java/com/clickhouse/client/api/ClickHouseException.java
new file mode 100644
index 000000000..83da17938
--- /dev/null
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ClickHouseException.java
@@ -0,0 +1,18 @@
+package com.clickhouse.client.api;
+
+public class ClickHouseException extends RuntimeException {
+    protected boolean isRetryable  = false;
+
+    public ClickHouseException(String message) {
+        super(message);
+    }
+
+    public ClickHouseException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ClickHouseException(Throwable cause) {
+        super(cause);
+    }
+    public boolean isRetryable() { return isRetryable; }
+}
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/Client.java b/client-v2/src/main/java/com/clickhouse/client/api/Client.java
index b014dc99f..cc7890fd2 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/Client.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/Client.java
@@ -813,7 +813,7 @@ public Builder setClientNetworkBufferSize(int size) {
 
         /**
          * Sets list of causes that should be retried on.
-         * Default {@code [NoHttpResponse, ConnectTimeout, ConnectionRequestTimeout]}
+         * Default {@code [NoHttpResponse, ConnectTimeout, ConnectionRequestTimeout, ServerRetryable]}
          * Use {@link ClientFaultCause#None} to disable retries.
          *
          * @param causes - list of causes
@@ -1464,7 +1464,8 @@ public CompletableFuture<InsertResponse> insert(String tableName,
                     }
                 }
             }
-            throw new ClientException("Insert request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime), lastException);
+            LOG.warn("Insert request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime));
+            throw lastException;
         };
 
         return runAsyncOperation(responseSupplier, settings.getAllSettings());
@@ -1586,8 +1587,8 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         }
                     }
                 }
-
-                throw new ClientException("Query request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime), lastException);
+                LOG.warn("Query request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime));
+                throw lastException;
             };
 
         return runAsyncOperation(responseSupplier, settings.getAllSettings());
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java b/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java
index 06e0a9153..c46858fc1 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java
@@ -120,7 +120,7 @@ public enum ClientConfigProperties {
 
     CLIENT_RETRY_ON_FAILURE("client_retry_on_failures",
             String.join(",", ClientFaultCause.NoHttpResponse.name(), ClientFaultCause.ConnectTimeout.name(),
-            ClientFaultCause.ConnectionRequestTimeout.name())),
+            ClientFaultCause.ConnectionRequestTimeout.name(), ClientFaultCause.ServerRetryable.name())),
 
     CLIENT_NAME("client_name"),
 
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ClientException.java b/client-v2/src/main/java/com/clickhouse/client/api/ClientException.java
index 32c88f120..7a967f816 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/ClientException.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ClientException.java
@@ -1,12 +1,12 @@
-package com.clickhouse.client.api;
-
-public class ClientException extends RuntimeException {
-
-    public ClientException(String message) {
-        super(message);
-    }
-
-    public ClientException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+package com.clickhouse.client.api;
+
+public class ClientException extends ClickHouseException {
+
+    public ClientException(String message) {
+        super(message);
+    }
+
+    public ClientException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ClientFaultCause.java b/client-v2/src/main/java/com/clickhouse/client/api/ClientFaultCause.java
index d0e4f3212..95ff3a129 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/ClientFaultCause.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ClientFaultCause.java
@@ -8,4 +8,5 @@ public enum ClientFaultCause {
     ConnectTimeout,
     ConnectionRequestTimeout,
     SocketTimeout,
+    ServerRetryable,
 }
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ConnectionInitiationException.java b/client-v2/src/main/java/com/clickhouse/client/api/ConnectionInitiationException.java
index b70d24280..b4679d9b5 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/ConnectionInitiationException.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ConnectionInitiationException.java
@@ -1,12 +1,14 @@
-package com.clickhouse.client.api;
-
-public class ConnectionInitiationException extends ClientException {
-
-    public ConnectionInitiationException(String message) {
-        super(message);
-    }
-
-    public ConnectionInitiationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+package com.clickhouse.client.api;
+
+public class ConnectionInitiationException extends ClickHouseException {
+
+    public ConnectionInitiationException(String message) {
+        super(message);
+        this.isRetryable = true;
+    }
+
+    public ConnectionInitiationException(String message, Throwable cause) {
+        super(message, cause);
+        this.isRetryable = true;
+    }
+}
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/DataTransferException.java b/client-v2/src/main/java/com/clickhouse/client/api/DataTransferException.java
new file mode 100644
index 000000000..033beb2ae
--- /dev/null
+++ b/client-v2/src/main/java/com/clickhouse/client/api/DataTransferException.java
@@ -0,0 +1,12 @@
+package com.clickhouse.client.api;
+
+public class DataTransferException extends ClickHouseException {
+
+    public DataTransferException(String message) {
+        super(message);
+    }
+
+    public DataTransferException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ServerException.java b/client-v2/src/main/java/com/clickhouse/client/api/ServerException.java
index c4476e1cc..0c6ed7574 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/ServerException.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ServerException.java
@@ -1,40 +1,69 @@
-package com.clickhouse.client.api;
-
-public class ServerException extends RuntimeException {
-
-    public static final int CODE_UNKNOWN = 0;
-
-    public static final int TABLE_NOT_FOUND = 60;
-
-    private final int code;
-
-    private final int transportProtocolCode;
-
-    public ServerException(int code, String message) {
-        this(code, message, 500);
-    }
-
-    public ServerException(int code, String message, int transportProtocolCode) {
-        super(message);
-        this.code = code;
-        this.transportProtocolCode = transportProtocolCode;
-    }
-
-    /**
-     * Returns CH server error code. May return 0 if code is unknown.
-     * @return - error code from server response
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /**
-     * Returns error code of underlying transport protocol. For example, HTTP status.
-     * By default, will return {@code 500 } what is derived from HTTP Server Internal Error.
-     *
-     * @return - transport status code
-     */
-    public int getTransportProtocolCode() {
-        return transportProtocolCode;
-    }
-}
+package com.clickhouse.client.api;
+
+public class ServerException extends ClickHouseException {
+
+    public static final int CODE_UNKNOWN = 0;
+
+    public static final int TABLE_NOT_FOUND = 60;
+
+    private final int code;
+
+    private final int transportProtocolCode;
+
+    public ServerException(int code, String message) {
+        this(code, message, 500);
+    }
+
+    public ServerException(int code, String message, int transportProtocolCode) {
+        super(message);
+        this.code = code;
+        this.transportProtocolCode = transportProtocolCode;
+        this.isRetryable = discoverIsRetryable(code, message, transportProtocolCode);
+    }
+
+    /**
+     * Returns CH server error code. May return 0 if code is unknown.
+     * @return - error code from server response
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Returns error code of underlying transport protocol. For example, HTTP status.
+     * By default, will return {@code 500 } what is derived from HTTP Server Internal Error.
+     *
+     * @return - transport status code
+     */
+    public int getTransportProtocolCode() {
+        return transportProtocolCode;
+    }
+
+    public boolean isRetryable() {
+        return isRetryable;
+    }
+
+    private boolean discoverIsRetryable(int code, String message, int transportProtocolCode) {
+        //Let's check if we have a ServerException to reference the error code
+        //https://github.com/ClickHouse/ClickHouse/blob/master/src/Common/ErrorCodes.cpp
+        switch (code) { // UNEXPECTED_END_OF_FILE
+            case 3: // UNEXPECTED_END_OF_FILE
+            case 107: // FILE_DOESNT_EXIST
+            case 159: // TIMEOUT_EXCEEDED
+            case 164: // READONLY
+            case 202: // TOO_MANY_SIMULTANEOUS_QUERIES
+            case 203: // NO_FREE_CONNECTION
+            case 209: // SOCKET_TIMEOUT
+            case 210: // NETWORK_ERROR
+            case 241: // MEMORY_LIMIT_EXCEEDED
+            case 242: // TABLE_IS_READ_ONLY
+            case 252: // TOO_MANY_PARTS
+            case 285: // TOO_FEW_LIVE_REPLICAS
+            case 319: // UNKNOWN_STATUS_OF_INSERT
+            case 425: // SYSTEM_ERROR
+            case 999: // KEEPER_EXCEPTION
+                return true;
+        };
+        return false;
+    }
+}
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java b/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java
index 62298e572..577617678 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java
@@ -33,10 +33,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Stack;
 import java.util.TimeZone;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 /**
  * This class is not thread safe and should not be shared between multiple threads.
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/MapBackedRecord.java b/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/MapBackedRecord.java
index 3d375d168..f3e5d0856 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/MapBackedRecord.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/MapBackedRecord.java
@@ -5,7 +5,6 @@
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.NullValueException;
 import com.clickhouse.data.ClickHouseColumn;
-import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
@@ -13,7 +12,6 @@
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.time.*;
-import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAmount;
 import java.util.HashMap;
 import java.util.List;
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java b/client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java
index 970a18f03..1d28f82d0 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java
@@ -1,14 +1,7 @@
 package com.clickhouse.client.api.internal;
 
 import com.clickhouse.client.ClickHouseSslContextProvider;
-import com.clickhouse.client.api.Client;
-import com.clickhouse.client.api.ClientConfigProperties;
-import com.clickhouse.client.api.ClientException;
-import com.clickhouse.client.api.ClientFaultCause;
-import com.clickhouse.client.api.ClientMisconfigurationException;
-import com.clickhouse.client.api.ConnectionInitiationException;
-import com.clickhouse.client.api.ConnectionReuseStrategy;
-import com.clickhouse.client.api.ServerException;
+import com.clickhouse.client.api.*;
 import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
 import com.clickhouse.client.api.enums.ProxyType;
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
@@ -379,7 +372,7 @@ public Exception readError(ClassicHttpResponse httpResponse) {
     private AtomicLong timeToPoolVent = new AtomicLong(0);
 
     public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> requestConfig, LZ4Factory lz4Factory,
-                                              IOCallback<OutputStream> writeCallback) throws IOException {
+                                              IOCallback<OutputStream> writeCallback) throws Exception {
         if (poolControl != null && timeToPoolVent.get() < System.currentTimeMillis()) {
             timeToPoolVent.set(System.currentTimeMillis() + POOL_VENT_TIMEOUT);
             poolControl.closeExpired();
@@ -432,14 +425,10 @@ public ClassicHttpResponse executeRequest(Endpoint server, Map<String, Object> r
 
         } catch (UnknownHostException e) {
             LOG.warn("Host '{}' unknown", server.getBaseURL());
-            throw new ClientException("Unknown host", e);
+            throw e;
         } catch (ConnectException | NoRouteToHostException e) {
             LOG.warn("Failed to connect to '{}': {}", server.getBaseURL(), e.getMessage());
-            throw new ClientException("Failed to connect", e);
-        } catch (ConnectionRequestTimeoutException | ServerException | NoHttpResponseException | ClientException | SocketTimeoutException e) {
             throw e;
-        } catch (Exception e) {
-            throw new ClientException(e.getMessage(), e);
         }
     }
 
@@ -651,6 +640,12 @@ public boolean shouldRetry(Throwable ex, Map<String, Object> requestSettings) {
             return retryCauses.contains(ClientFaultCause.SocketTimeout);
         }
 
+        // there are some db retryable error codes
+        if (ex instanceof ServerException || ex.getCause() instanceof ServerException) {
+            ServerException se = (ServerException) ex;
+            return se.isRetryable() && retryCauses.contains(ClientFaultCause.ServerRetryable);
+        }
+
         return false;
     }
 
@@ -664,11 +659,17 @@ public RuntimeException wrapException(String message, Exception cause) {
         if (cause instanceof ConnectionRequestTimeoutException ||
                 cause instanceof NoHttpResponseException ||
                 cause instanceof ConnectTimeoutException ||
-                cause instanceof ConnectException) {
+                cause instanceof ConnectException ||
+                cause instanceof UnknownHostException ||
+                cause instanceof NoRouteToHostException) {
             return new ConnectionInitiationException(message, cause);
         }
 
-        return new ClientException(message, cause);
+        if (cause instanceof SocketTimeoutException || cause instanceof IOException) {
+            return new DataTransferException(message, cause);
+        }
+        // if we can not identify the exception explicitly we catch as our base exception ClickHouseException
+        return new ClickHouseException(message, cause);
     }
 
 
diff --git a/client-v2/src/test/java/com/clickhouse/client/ClientTests.java b/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
index 3499f1dc1..f9bc2e08a 100644
--- a/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
@@ -285,7 +285,7 @@ public void testWithOldDefaults() {
                 .enableConnectionPool(true)
                 .setConnectionTTL(-1, MILLIS)
                 .retryOnFailures(ClientFaultCause.NoHttpResponse, ClientFaultCause.ConnectTimeout,
-                        ClientFaultCause.ConnectionRequestTimeout)
+                        ClientFaultCause.ConnectionRequestTimeout, ClientFaultCause.ServerRetryable)
                 .setClientNetworkBufferSize(300_000)
                 .setMaxRetries(3)
                 .allowBinaryReaderToReuseBuffers(false)
diff --git a/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java b/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java
index dbc41304f..d451ec645 100644
--- a/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java
@@ -1,5 +1,6 @@
 package com.clickhouse.client;
 
+import com.clickhouse.client.api.ClickHouseException;
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ClientException;
@@ -280,7 +281,7 @@ public void testInsertAndNoHttpResponseFailure(String body, int maxRetries, Thro
 
         try {
             function.apply(mockServerClient);
-        } catch (ClientException e) {
+        } catch (ConnectionInitiationException e) {
             e.printStackTrace();
             if (!shouldFail) {
                 Assert.fail("Unexpected exception", e);
@@ -777,7 +778,8 @@ public void testErrorWithSendProgressHeaders() throws Exception {
             try (QueryResponse resp = client.query("INSERT INTO test_omm_table SELECT randomString(16) FROM numbers(300000000)", settings).get()) {
 
             } catch (ServerException e) {
-                Assert.assertEquals(e.getCode(), 241);
+                // 241 - MEMORY_LIMIT_EXCEEDED or 243 -NOT_ENOUGH_SPACE
+                Assert.assertTrue(e.getCode() == 241 || e.getCode() == 243);
             }
         }
     }
diff --git a/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java b/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
index b37bfe4a2..903abdf93 100644
--- a/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
@@ -4,10 +4,7 @@
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.ClickHouseServerForTest;
-import com.clickhouse.client.api.Client;
-import com.clickhouse.client.api.ClientConfigProperties;
-import com.clickhouse.client.api.ClientException;
-import com.clickhouse.client.api.DataTypeUtils;
+import com.clickhouse.client.api.*;
 import com.clickhouse.client.api.command.CommandResponse;
 import com.clickhouse.client.api.command.CommandSettings;
 import com.clickhouse.client.api.data_formats.RowBinaryFormatWriter;
@@ -26,16 +23,10 @@
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseVersion;
-import com.clickhouse.data.format.BinaryStreamUtils;
-import lombok.Data;
-import net.jpountz.lz4.LZ4Compressor;
-import net.jpountz.lz4.LZ4Factory;
-import net.jpountz.lz4.LZ4SafeDecompressor;
 import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStream;
 import org.apache.commons.compress.compressors.snappy.SnappyCompressorOutputStream;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
-import org.testcontainers.shaded.org.checkerframework.checker.units.qual.A;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -59,7 +50,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPOutputStream;
@@ -242,7 +232,7 @@ public void testInsertingPOJOWithNullValueForNonNullableColumn() throws Exceptio
 
         try (InsertResponse response = client.insert(tableName, Collections.singletonList(pojo), settings).get(30, TimeUnit.SECONDS)) {
             fail("Should have thrown an exception");
-        } catch (ClientException e) {
+        } catch (ClickHouseException e) {
             e.printStackTrace();
             assertTrue(e.getCause() instanceof  IllegalArgumentException);
         }