diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index e252633f8e3..a768610b750 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1281,7 +1281,7 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag
         }
         URI uri = null;
         try {
-            uri = new URI(cmd.getUrl());
+            uri = new URI(UriUtils.encodeURIComponent(cmd.getUrl()));
             if (uri.getScheme() == null) {
                 throw new InvalidParameterValueException("scheme is null " + cmd.getUrl() + ", add nfs:// as a prefix");
             } else if (uri.getScheme().equalsIgnoreCase("nfs")) {