diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 89ce8e009a3..0da945154da 100755
--- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -1366,7 +1366,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
 
     private Answer execute(ListTemplateCommand cmd) {
         if (!_inSystemVM) {
-            return new Answer(cmd, true, null);
+           return new ListTemplateAnswer(null, null);
         }
 
         DataStoreTO store = cmd.getDataStore();
@@ -1391,7 +1391,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
 
     private Answer execute(ListVolumeCommand cmd) {
         if (!_inSystemVM) {
-            return new Answer(cmd, true, null);
+            return new ListVolumeAnswer(cmd.getSecUrl(), null);
         }
         DataStoreTO store = cmd.getDataStore();
         if (store instanceof NfsTO) {