diff --git a/src/com/owncloud/android/lib/common/operations/ForbiddenExceptionParser.java b/src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java
similarity index 94%
rename from src/com/owncloud/android/lib/common/operations/ForbiddenExceptionParser.java
rename to src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java
index df9bdab3..35fdf94a 100644
--- a/src/com/owncloud/android/lib/common/operations/ForbiddenExceptionParser.java
+++ b/src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java
@@ -33,10 +33,10 @@ import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * Parser for forbidden server exception
- * @author masensio
+ * Parser for server exceptions
+ * @author davidgonzalez
  */
-public class ForbiddenExceptionParser {
+public class ErrorMessageParser {
 	// No namespaces
 	private static final String ns = null;
 
@@ -45,9 +45,9 @@ public class ForbiddenExceptionParser {
 	private static final String NODE_MESSAGE = "s:message";
 
 	/**
-	 * Parse is as an forbidden exception
+	 * Parse exception response
 	 * @param is
-	 * @return reason for forbidden exception
+	 * @return errorMessage for an exception
 	 * @throws XmlPullParserException
 	 * @throws IOException
 	 */
@@ -75,7 +75,7 @@ public class ForbiddenExceptionParser {
 	/**
 	 * Parse OCS node
 	 * @param parser
-	 * @return reason for forbidden exception
+	 * @return reason for exception
 	 * @throws XmlPullParserException
 	 * @throws IOException
 	 */
diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
index b14efdb7..e4b2c67e 100644
--- a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -1,22 +1,22 @@
 /* ownCloud Android Library is available under MIT license
  *   Copyright (C) 2016 ownCloud GmbH.
- *   
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- *   
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
- *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
- *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *   THE SOFTWARE.
  *
@@ -251,7 +251,7 @@ public class RemoteOperationResult implements Serializable {
 
             if (bodyResponse != null && bodyResponse.length() > 0) {
                 InputStream is = new ByteArrayInputStream(bodyResponse.getBytes());
-                ForbiddenExceptionParser xmlParser = new ForbiddenExceptionParser();
+                ErrorMessageParser xmlParser = new ErrorMessageParser();
                 try {
                     String errorMessage = xmlParser.parseXMLResponse(is);
                     if (errorMessage != "" && errorMessage != null) {