diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
index 64bc8246..e5c5b764 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavEntry.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -45,6 +45,8 @@ public class WebdavEntry {
     public static final String PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes";
     public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes";
 
+    private static final int CODE_PROP_NOT_FOUND = 404;
+
 	private String mName, mPath, mUri, mContentType, mEtag, mPermissions, mRemoteId;
 	private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize;
     private long mQuotaUsedBytes, mQuotaAvailableBytes;
@@ -57,6 +59,9 @@ public class WebdavEntry {
             mPath = mUri.split(splitElement, 2)[1];
 
             int status = ms.getStatus()[0].getStatusCode();
+            if ( status == CODE_PROP_NOT_FOUND ) {
+                status = ms.getStatus()[1].getStatusCode();
+            }
             DavPropertySet propSet = ms.getProperties(status);
             @SuppressWarnings("rawtypes")
             DavProperty prop = propSet.get(DavPropertyName.DISPLAYNAME);
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 1591f3c9..1a5d13f9 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -39,9 +39,9 @@ import com.owncloud.android.lib.common.network.WebdavEntry;
 
 public class RemoteFile implements Parcelable, Serializable {
 
-	/** Generated - should be refreshed every time the class changes!! */
-	private static final long serialVersionUID = 532139091191390616L;
-	
+    /** Generated - should be refreshed every time the class changes!! */
+    private static final long serialVersionUID = 3130865437811248451L;
+
 	private String mRemotePath;
 	private String mMimeType;
 	private long mLength;