diff --git a/azurestack/resource-manager/v2017_06_01/pom.xml b/azurestack/resource-manager/v2017_06_01/pom.xml
index 70a2dd8d22fa..261684d344e2 100644
--- a/azurestack/resource-manager/v2017_06_01/pom.xml
+++ b/azurestack/resource-manager/v2017_06_01/pom.xml
@@ -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/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/CustomerSubscriptionsImpl.java b/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/CustomerSubscriptionsImpl.java
index b3b968107662..78e6131a0811 100644
--- a/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/CustomerSubscriptionsImpl.java
+++ b/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/CustomerSubscriptionsImpl.java
@@ -64,10 +64,14 @@ public CustomerSubscription call(CustomerSubscriptionInner inner) {
     public Observable<CustomerSubscription> getAsync(String resourceGroup, String registrationName, String customerSubscriptionName) {
         CustomerSubscriptionsInner client = this.inner();
         return client.getAsync(resourceGroup, registrationName, customerSubscriptionName)
-        .map(new Func1<CustomerSubscriptionInner, CustomerSubscription>() {
+        .flatMap(new Func1<CustomerSubscriptionInner, Observable<CustomerSubscription>>() {
             @Override
-            public CustomerSubscription call(CustomerSubscriptionInner inner) {
-                return wrapModel(inner);
+            public Observable<CustomerSubscription> call(CustomerSubscriptionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((CustomerSubscription)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/ProductsImpl.java b/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/ProductsImpl.java
index 69d0a515aab0..95fcad349bac 100644
--- a/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/ProductsImpl.java
+++ b/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/ProductsImpl.java
@@ -67,10 +67,14 @@ public Product call(ProductInner inner) {
     public Observable<Product> getAsync(String resourceGroup, String registrationName, String productName) {
         ProductsInner client = this.inner();
         return client.getAsync(resourceGroup, registrationName, productName)
-        .map(new Func1<ProductInner, Product>() {
+        .flatMap(new Func1<ProductInner, Observable<Product>>() {
             @Override
-            public Product call(ProductInner inner) {
-                return wrapModel(inner);
+            public Observable<Product> call(ProductInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Product)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/RegistrationImpl.java b/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/RegistrationImpl.java
index 4bb0b152c8f2..1929812c87c8 100644
--- a/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/RegistrationImpl.java
+++ b/azurestack/resource-manager/v2017_06_01/src/main/java/com/microsoft/azure/management/azurestack/v2017_06_01/implementation/RegistrationImpl.java
@@ -9,7 +9,6 @@
 package com.microsoft.azure.management.azurestack.v2017_06_01.implementation;
 
 import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
-import com.microsoft.azure.management.azurestack.v2017_06_01.Location;
 import com.microsoft.azure.management.azurestack.v2017_06_01.Registration;
 import rx.Observable;
 import com.microsoft.azure.management.azurestack.v2017_06_01.RegistrationParameter;
@@ -25,7 +24,7 @@ class RegistrationImpl extends GroupableResourceCoreImpl<Registration, Registrat
     @Override
     public Observable<Registration> createResourceAsync() {
         RegistrationsInner client = this.manager().inner().registrations();
-        this.createOrUpdateParameter.withLocation(Location.fromString(inner().location()));
+        this.createOrUpdateParameter.withLocation(inner().location());
         return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.createOrUpdateParameter)
             .map(new Func1<RegistrationInner, RegistrationInner>() {
                @Override