diff --git a/pom.xml b/pom.xml
index e95bf3f..574d6ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.lindar</groupId>
             <artifactId>well-rested-client</artifactId>
-            <version>1.5.5</version>
+            <version>1.6.0</version>
         </dependency>
         
         <dependency>
diff --git a/src/main/java/com/lindar/dotmailer/api/AbstractResource.java b/src/main/java/com/lindar/dotmailer/api/AbstractResource.java
index 683fa6b..02eb40f 100644
--- a/src/main/java/com/lindar/dotmailer/api/AbstractResource.java
+++ b/src/main/java/com/lindar/dotmailer/api/AbstractResource.java
@@ -261,6 +261,9 @@ private boolean validBlankResponse(WellRestedResponse response) {
     private <T> Result<T> parseErrorResponse(WellRestedResponse response) {
         ErrorResponse errorResponse = response.fromJson().castTo(ErrorResponse.class);
         if (errorResponse == null || errorResponse.getMessage() == null || StringUtils.isBlank(errorResponse.getMessage())) {
+            if(response.isConnectionTimeout() || response.isSocketTimeout()) {
+                return ResultBuilder.failed().msg("Timeout Error").code("TIMEOUT_ERROR").buildAndIgnoreData();
+            }
             return ResultBuilder.failed().msg("Unknown Error").code("UNKNOWN_ERROR").buildAndIgnoreData();
         }