diff --git a/sdk/servicebus/mgmt-v2015_08_01/pom.xml b/sdk/servicebus/mgmt-v2015_08_01/pom.xml
index 5821124771aa2..6c4421ae3e797 100644
--- a/sdk/servicebus/mgmt-v2015_08_01/pom.xml
+++ b/sdk/servicebus/mgmt-v2015_08_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-servicebus</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/NamespacesImpl.java b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/NamespacesImpl.java
index 91ec2e3ca1b02..2c5e91d880a1c 100644
--- a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/NamespacesImpl.java
+++ b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/NamespacesImpl.java
@@ -175,10 +175,14 @@ private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAu
     public Observable<NamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
         NamespacesInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName)
-        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
+        .flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<NamespaceSharedAccessAuthorizationRuleResource>>() {
             @Override
-            public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
-                return wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            public Observable<NamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((NamespaceSharedAccessAuthorizationRuleResource)wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/QueuesImpl.java b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/QueuesImpl.java
index d97578a9894fb..0b81385e29b91 100644
--- a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/QueuesImpl.java
+++ b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/QueuesImpl.java
@@ -67,10 +67,14 @@ public QueueResource call(QueueResourceInner inner) {
     public Observable<QueueResource> getAsync(String resourceGroupName, String namespaceName, String queueName) {
         QueuesInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, queueName)
-        .map(new Func1<QueueResourceInner, QueueResource>() {
+        .flatMap(new Func1<QueueResourceInner, Observable<QueueResource>>() {
             @Override
-            public QueueResource call(QueueResourceInner inner) {
-                return wrapModel(inner);
+            public Observable<QueueResource> call(QueueResourceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((QueueResource)wrapModel(inner));
+                }
             }
        });
     }
@@ -107,10 +111,14 @@ private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAu
     public Observable<QueueNamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String queueName, String authorizationRuleName) {
         QueuesInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, queueName, authorizationRuleName)
-        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, QueueNamespaceSharedAccessAuthorizationRuleResource>() {
+        .flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<QueueNamespaceSharedAccessAuthorizationRuleResource>>() {
             @Override
-            public QueueNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
-                return wrapQueueNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            public Observable<QueueNamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((QueueNamespaceSharedAccessAuthorizationRuleResource)wrapQueueNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/SubscriptionsImpl.java b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/SubscriptionsImpl.java
index a503c57b1b094..ad23625a7f6cf 100644
--- a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/SubscriptionsImpl.java
+++ b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/SubscriptionsImpl.java
@@ -64,10 +64,14 @@ public SubscriptionResource call(SubscriptionResourceInner inner) {
     public Observable<SubscriptionResource> getAsync(String resourceGroupName, String namespaceName, String topicName, String subscriptionName) {
         SubscriptionsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, topicName, subscriptionName)
-        .map(new Func1<SubscriptionResourceInner, SubscriptionResource>() {
+        .flatMap(new Func1<SubscriptionResourceInner, Observable<SubscriptionResource>>() {
             @Override
-            public SubscriptionResource call(SubscriptionResourceInner inner) {
-                return wrapModel(inner);
+            public Observable<SubscriptionResource> call(SubscriptionResourceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((SubscriptionResource)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/TopicsImpl.java b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/TopicsImpl.java
index 395bf0675c6a2..2ebae4907a434 100644
--- a/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/TopicsImpl.java
+++ b/sdk/servicebus/mgmt-v2015_08_01/src/main/java/com/microsoft/azure/management/servicebus/v2015_08_01/implementation/TopicsImpl.java
@@ -67,10 +67,14 @@ public TopicResource call(TopicResourceInner inner) {
     public Observable<TopicResource> getAsync(String resourceGroupName, String namespaceName, String topicName) {
         TopicsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, topicName)
-        .map(new Func1<TopicResourceInner, TopicResource>() {
+        .flatMap(new Func1<TopicResourceInner, Observable<TopicResource>>() {
             @Override
-            public TopicResource call(TopicResourceInner inner) {
-                return wrapModel(inner);
+            public Observable<TopicResource> call(TopicResourceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((TopicResource)wrapModel(inner));
+                }
             }
        });
     }
@@ -107,10 +111,14 @@ private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAu
     public Observable<TopicNamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String topicName, String authorizationRuleName) {
         TopicsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, topicName, authorizationRuleName)
-        .map(new Func1<SharedAccessAuthorizationRuleResourceInner, TopicNamespaceSharedAccessAuthorizationRuleResource>() {
+        .flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<TopicNamespaceSharedAccessAuthorizationRuleResource>>() {
             @Override
-            public TopicNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
-                return wrapTopicNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
+            public Observable<TopicNamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((TopicNamespaceSharedAccessAuthorizationRuleResource)wrapTopicNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
+                }
             }
        });
     }