diff --git a/sdk/containerregistry/mgmt-v2017_06_01_preview/pom.xml b/sdk/containerregistry/mgmt-v2017_06_01_preview/pom.xml
index 5b24e72a3f3a..7e6a610b267e 100644
--- a/sdk/containerregistry/mgmt-v2017_06_01_preview/pom.xml
+++ b/sdk/containerregistry/mgmt-v2017_06_01_preview/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-containerregistry</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/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/Target.java b/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/Target.java
index c3a24974a135..c14b7193d590 100644
--- a/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/Target.java
+++ b/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/Target.java
@@ -28,7 +28,7 @@ public class Target {
 
     /**
      * The digest of the content, as defined by the Registry V2 HTTP API
-     * Specificiation.
+     * Specification.
      */
     @JsonProperty(value = "digest")
     private String digest;
@@ -98,7 +98,7 @@ public Target withSize(Long size) {
     }
 
     /**
-     * Get the digest of the content, as defined by the Registry V2 HTTP API Specificiation.
+     * Get the digest of the content, as defined by the Registry V2 HTTP API Specification.
      *
      * @return the digest value
      */
@@ -107,7 +107,7 @@ public String digest() {
     }
 
     /**
-     * Set the digest of the content, as defined by the Registry V2 HTTP API Specificiation.
+     * Set the digest of the content, as defined by the Registry V2 HTTP API Specification.
      *
      * @param digest the digest value to set
      * @return the Target object itself.
diff --git a/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/ReplicationsImpl.java b/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/ReplicationsImpl.java
index e79a4505bc13..3f27ad516857 100644
--- a/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/ReplicationsImpl.java
+++ b/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/ReplicationsImpl.java
@@ -64,10 +64,14 @@ public Replication call(ReplicationInner inner) {
     public Observable<Replication> getAsync(String resourceGroupName, String registryName, String replicationName) {
         ReplicationsInner client = this.inner();
         return client.getAsync(resourceGroupName, registryName, replicationName)
-        .map(new Func1<ReplicationInner, Replication>() {
+        .flatMap(new Func1<ReplicationInner, Observable<Replication>>() {
             @Override
-            public Replication call(ReplicationInner inner) {
-                return wrapModel(inner);
+            public Observable<Replication> call(ReplicationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Replication)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/WebhooksImpl.java b/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/WebhooksImpl.java
index 6260a05f972a..4d6e8ab7c671 100644
--- a/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/WebhooksImpl.java
+++ b/sdk/containerregistry/mgmt-v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/implementation/WebhooksImpl.java
@@ -109,10 +109,14 @@ public Webhook call(WebhookInner inner) {
     public Observable<Webhook> getAsync(String resourceGroupName, String registryName, String webhookName) {
         WebhooksInner client = this.inner();
         return client.getAsync(resourceGroupName, registryName, webhookName)
-        .map(new Func1<WebhookInner, Webhook>() {
+        .flatMap(new Func1<WebhookInner, Observable<Webhook>>() {
             @Override
-            public Webhook call(WebhookInner inner) {
-                return wrapModel(inner);
+            public Observable<Webhook> call(WebhookInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Webhook)wrapModel(inner));
+                }
             }
        });
     }