diff --git a/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5ServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5ServiceImpl.java
index 223d016..f46c7ee 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5ServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5ServiceImpl.java
@@ -73,7 +73,11 @@ public class SushiliteR5ServiceImpl implements SushiliteR5Service {
                     new ParameterizedTypeReference<Object>() {});
         } catch (RestClientException rce) {
             String errorMsg = "Failed to get a response from sushiliteR5!";
-            logger.error(errorMsg + " URI was:\n" + uri + "\n" + rce.getMessage());
+            String message = rce.getMessage();
+            if ( (message != null) && message.contains("504 Gateway Time-out") )    // In this case the parsing-exception is thrown before we get to check the response code..
+                errorMsg += " Reason: 504 Gateway Time-out";
+
+            logger.error(errorMsg + " URI was:\n" + uri + "\n" + message);
             return ResponseEntity.internalServerError().body(errorMsg);
         }