diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
index 75a132b66..da1e453aa 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavEntry.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -84,7 +84,7 @@ public WebdavEntry(MultiStatusResponse ms, String splitElement) {
         if (ms.getStatus().length != 0) {
             mUri = ms.getHref();
 
-            mPath = mUri.split(splitElement, 2)[1];
+            mPath = mUri.split(splitElement, 2)[1].replace("//", "/");
 
             int status = ms.getStatus()[0].getStatusCode();
             if ( status == CODE_PROP_NOT_FOUND ) {
diff --git a/src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java b/src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
index afb8e137a..1e60b698f 100644
--- a/src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
+++ b/src/com/owncloud/android/lib/common/utils/WebDavFileUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Mario Danic
@@ -67,7 +67,7 @@ public ArrayList<Object> readData(MultiStatus remoteData,
         }
 
         // loop to update every child
-        RemoteFile remoteFile = null;
+        RemoteFile remoteFile;
         MultiStatusResponse[] responses = remoteData.getResponses();
         for (int i = start; i < responses.length; i++) {
             /// new OCFile instance with the data from the server