diff --git a/sdk/netapp/mgmt-v2017_08_15/pom.xml b/sdk/netapp/mgmt-v2017_08_15/pom.xml
index f6be3878ae4d..83eede16c012 100644
--- a/sdk/netapp/mgmt-v2017_08_15/pom.xml
+++ b/sdk/netapp/mgmt-v2017_08_15/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-netapp</artifactId>
     <version>1.0.0-beta</version>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java
index afeedce0a2f8..7b9e4e1cd238 100644
--- a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java
+++ b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java
@@ -64,10 +64,14 @@ public CapacityPool call(CapacityPoolInner inner) {
     public Observable<CapacityPool> getAsync(String resourceGroupName, String accountName, String poolName) {
         PoolsInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, poolName)
-        .map(new Func1<CapacityPoolInner, CapacityPool>() {
+        .flatMap(new Func1<CapacityPoolInner, Observable<CapacityPool>>() {
             @Override
-            public CapacityPool call(CapacityPoolInner inner) {
-                return wrapModel(inner);
+            public Observable<CapacityPool> call(CapacityPoolInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((CapacityPool)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java
index ca1cdd2a9c28..8784d2d03079 100644
--- a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java
+++ b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java
@@ -64,10 +64,14 @@ public Snapshot call(SnapshotInner inner) {
     public Observable<Snapshot> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName, String snapshotName) {
         SnapshotsInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, poolName, volumeName, snapshotName)
-        .map(new Func1<SnapshotInner, Snapshot>() {
+        .flatMap(new Func1<SnapshotInner, Observable<Snapshot>>() {
             @Override
-            public Snapshot call(SnapshotInner inner) {
-                return wrapModel(inner);
+            public Observable<Snapshot> call(SnapshotInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Snapshot)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java
index 0e5f313a05a5..e0cb921cbab2 100644
--- a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java
+++ b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java
@@ -64,10 +64,14 @@ public Volume call(VolumeInner inner) {
     public Observable<Volume> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName) {
         VolumesInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, poolName, volumeName)
-        .map(new Func1<VolumeInner, Volume>() {
+        .flatMap(new Func1<VolumeInner, Observable<Volume>>() {
             @Override
-            public Volume call(VolumeInner inner) {
-                return wrapModel(inner);
+            public Observable<Volume> call(VolumeInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Volume)wrapModel(inner));
+                }
             }
        });
     }