diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
index e17350de5..700242bf1 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
@@ -39,7 +39,7 @@ public class RequestResult {
     public static RequestResult extractFrom(ClientResponse clientResponse) {
         final int status = clientResponse.getStatus();
         final URI location = clientResponse.getLocation();
-        final String data = status != Response.Status.NO_CONTENT.getStatusCode() ? clientResponse.getEntity(String.class) : null;
+        final String data = clientResponse.hasEntity() ? clientResponse.getEntity(String.class) : null;
         clientResponse.close();
         return new RequestResult(status, location, data);
     }
diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
index 395ee5a2a..0d9fa8d37 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
 
 public class RestRequest {
 
-    public static final int CONNECT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
-    public static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
+    public static final int CONNECT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(300);
+    public static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(300);
     private final URI baseUri;
     private final Client client;