diff --git a/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java b/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java
index e57a82e5..ce6439ae 100644
--- a/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java
+++ b/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java
@@ -133,11 +133,14 @@ private <T> T convertStreamToTargetEntity(InputStream inputStream, Type targetEn
              Reader targetReader = new InputStreamReader(os)) {
             if (targetEntity != Void.class) {
                 result = gson.fromJson(targetReader, targetEntity);
-                /*
-                if (result != null) {
-                    Log.d(TAG, result.toString());
+                if (result == null) {
+                    if (targetEntity == Object.class) {
+                        return (T) NOTHING;
+                    } else {
+                        throw new IllegalStateException("Could not instantiate \"" +
+                                targetEntity.toString() + "\", because response was null.");
+                    }
                 }
-                */
             } else {
                 result = (T) NOTHING;
             }
@@ -165,7 +168,7 @@ public InputStream performNetworkRequest(NextcloudRequest request) throws Except
      * @throws Exception or SSOException
      */
     public Response performNetworkRequestV2(NextcloudRequest request) throws Exception {
-        return networkRequest.performNetworkRequestV2(request, null);
+        return networkRequest.performNetworkRequestV2(request, request.getBodyAsStream());
     }
 
     protected Gson getGson() {