diff --git a/sdk/relay/mgmt-v2017_04_01/pom.xml b/sdk/relay/mgmt-v2017_04_01/pom.xml
index d2b442f30400..c0339025f1b5 100644
--- a/sdk/relay/mgmt-v2017_04_01/pom.xml
+++ b/sdk/relay/mgmt-v2017_04_01/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-relay</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java
index 8ef35ae4901e..743a9a35c315 100644
--- a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java
+++ b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java
@@ -67,10 +67,14 @@ public HybridConnection call(HybridConnectionInner inner) {
     public Observable<HybridConnection> getAsync(String resourceGroupName, String namespaceName, String hybridConnectionName) {
         HybridConnectionsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, hybridConnectionName)
-        .map(new Func1<HybridConnectionInner, HybridConnection>() {
+        .flatMap(new Func1<HybridConnectionInner, Observable<HybridConnection>>() {
             @Override
-            public HybridConnection call(HybridConnectionInner inner) {
-                return wrapModel(inner);
+            public Observable<HybridConnection> call(HybridConnectionInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((HybridConnection)wrapModel(inner));
+                }
             }
        });
     }
@@ -107,10 +111,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingHybridC
     public Observable<HybridConnectionNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String hybridConnectionName, String authorizationRuleName) {
         HybridConnectionsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, HybridConnectionNamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<HybridConnectionNamespaceAuthorizationRule>>() {
             @Override
-            public HybridConnectionNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapHybridConnectionNamespaceAuthorizationRuleModel(inner);
+            public Observable<HybridConnectionNamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((HybridConnectionNamespaceAuthorizationRule)wrapHybridConnectionNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java
index fc629fc39f96..719527723180 100644
--- a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java
+++ b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java
@@ -176,10 +176,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingNamespa
     public Observable<NamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
         NamespacesInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, NamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<NamespaceAuthorizationRule>>() {
             @Override
-            public NamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapNamespaceAuthorizationRuleModel(inner);
+            public Observable<NamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NamespaceAuthorizationRule)wrapNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java
index 228fc548a847..0ea0ea403f8f 100644
--- a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java
+++ b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java
@@ -67,10 +67,14 @@ public WcfRelay call(WcfRelayInner inner) {
     public Observable<WcfRelay> getAsync(String resourceGroupName, String namespaceName, String relayName) {
         WCFRelaysInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, relayName)
-        .map(new Func1<WcfRelayInner, WcfRelay>() {
+        .flatMap(new Func1<WcfRelayInner, Observable<WcfRelay>>() {
             @Override
-            public WcfRelay call(WcfRelayInner inner) {
-                return wrapModel(inner);
+            public Observable<WcfRelay> call(WcfRelayInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((WcfRelay)wrapModel(inner));
+                }
             }
        });
     }
@@ -107,10 +111,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingWCFRela
     public Observable<WcfRelayNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String relayName, String authorizationRuleName) {
         WCFRelaysInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, relayName, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, WcfRelayNamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<WcfRelayNamespaceAuthorizationRule>>() {
             @Override
-            public WcfRelayNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapWcfRelayNamespaceAuthorizationRuleModel(inner);
+            public Observable<WcfRelayNamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((WcfRelayNamespaceAuthorizationRule)wrapWcfRelayNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }