diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
index 02a12bd8..6d2b033e 100644
--- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
+++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java
@@ -232,7 +232,7 @@ public class AccountUtils {
 
 		if (client != null) {
 			String cookiesString = client.getCookiesString();
-			if (cookiesString != "") {
+			if (!"".equals(cookiesString)) {
 				ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); 
 				// Log_OC.d(TAG, "Saving Cookies: "+ cookiesString );
 			}
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index a54ca113..8075d1ef 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -391,7 +391,9 @@ public class RemoteOperationResult implements Serializable {
             return "Authenticated with a different account than the one updating";
         } else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) {
                 return "The file name contains an forbidden character";
-        }
+        } else if (mCode == ResultCode.FILE_NOT_FOUND) {
+	  	return "Local file does not exist";
+ 	}
 
         return "Operation finished with HTTP status code " + mHttpCode + " (" +
                 (isSuccess() ? "success" : "fail") + ")";