diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
index c2fb651a..ed68535d 100644
--- a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
@@ -40,6 +40,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 
 /**
@@ -88,10 +89,13 @@ public class MoveRemoteFileOperation extends RemoteOperation {
      */
 	@Override
 	protected RemoteOperationResult run(OwnCloudClient client) {
-		
+
+		OwnCloudVersion version = client.getOwnCloudVersion();
+		boolean versionWithForbiddenChars =
+                (version != null && version.isVersionWithForbiddenCharacters());
+
     	/// check parameters
-        if (!FileUtils.isValidPath(mTargetRemotePath,
-                client.getOwnCloudVersion().isVersionWithForbiddenCharacters())) {
+        if (!FileUtils.isValidPath(mTargetRemotePath, versionWithForbiddenChars)) {
         	return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
         }
         
diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 30b88a86..0ceaf227 100644
--- a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -34,6 +34,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 
 /**
@@ -88,9 +89,11 @@ public class RenameRemoteFileOperation extends RemoteOperation {
 		RemoteOperationResult result = null;
 		
 		LocalMoveMethod move = null;
-        
-        boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath,
-                client.getOwnCloudVersion().isVersionWithForbiddenCharacters());
+
+        OwnCloudVersion version = client.getOwnCloudVersion();
+        boolean versionWithForbiddenChars =
+                (version != null && version.isVersionWithForbiddenCharacters());
+        boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath, versionWithForbiddenChars);
         
         if (noInvalidChars) {
             try {