diff --git a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
index 7ab9e2d8..1fa9d5fd 100644
--- a/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
@@ -40,7 +40,6 @@ import com.owncloud.android.lib.common.network.ChunkFromFileChannelRequestEntity
 import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 
@@ -88,9 +87,9 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                 mPutMethod.setRequestEntity(mEntity);
                 status = client.executeMethod(mPutMethod);
 
-                // TODO: Detect INVALID_CHARACTER_DETECT_IN SERVER in a better way?
-                if (status == 400 || status == 500) {
-                    InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
+                if (status == 400) {
+                    InvalidCharacterExceptionParser xmlParser =
+                            new InvalidCharacterExceptionParser();
                     InputStream is = new ByteArrayInputStream(
                             mPutMethod.getResponseBodyAsString().getBytes());
                     try {
diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
index 9fcd6515..25dc87f5 100644
--- a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
@@ -94,7 +94,6 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 			}
 
 			int status = uploadFile(client);
-			// TODO: Detect INVALID_CHARACTER_DETECT_IN SERVER in a better way?
 			if (mForbiddenCharsInServer){
 				result = new RemoteOperationResult(
 						RemoteOperationResult.ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER);
@@ -132,8 +131,7 @@ public class UploadRemoteFileOperation extends RemoteOperation {
 			mPutMethod.setRequestEntity(mEntity);
 			status = client.executeMethod(mPutMethod);
 
-			// TODO: Detect INVALID_CHARACTER_DETECT_IN SERVER in a better way?
-			if (status == 400 || status == 500) {
+			if (status == 400) {
 				InvalidCharacterExceptionParser xmlParser = new InvalidCharacterExceptionParser();
 				InputStream is = new ByteArrayInputStream(
 						mPutMethod.getResponseBodyAsString().getBytes());