diff --git a/batchai/resource-manager/v2018_05_01/pom.xml b/batchai/resource-manager/v2018_05_01/pom.xml
index 6368c041c91f..0da7db6e5cd4 100644
--- a/batchai/resource-manager/v2018_05_01/pom.xml
+++ b/batchai/resource-manager/v2018_05_01/pom.xml
@@ -15,7 +15,7 @@
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-batchai</artifactId>
-    <version>1.0.0-beta-2</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for BatchAI Management</name>
     <description>This package contains Microsoft BatchAI Management SDK.</description>
@@ -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/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ClustersImpl.java b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ClustersImpl.java
index 737a3b796e1d..472b15ac157b 100644
--- a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ClustersImpl.java
+++ b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ClustersImpl.java
@@ -83,10 +83,14 @@ public Cluster call(ClusterInner inner) {
     public Observable<Cluster> getAsync(String resourceGroupName, String workspaceName, String clusterName) {
         ClustersInner client = this.inner();
         return client.getAsync(resourceGroupName, workspaceName, clusterName)
-        .map(new Func1<ClusterInner, Cluster>() {
+        .flatMap(new Func1<ClusterInner, Observable<Cluster>>() {
             @Override
-            public Cluster call(ClusterInner inner) {
-                return wrapModel(inner);
+            public Observable<Cluster> call(ClusterInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Cluster)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ExperimentsImpl.java b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ExperimentsImpl.java
index 02d27421edee..ac775cf2c1fe 100644
--- a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ExperimentsImpl.java
+++ b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/ExperimentsImpl.java
@@ -64,10 +64,14 @@ public Experiment call(ExperimentInner inner) {
     public Observable<Experiment> getAsync(String resourceGroupName, String workspaceName, String experimentName) {
         ExperimentsInner client = this.inner();
         return client.getAsync(resourceGroupName, workspaceName, experimentName)
-        .map(new Func1<ExperimentInner, Experiment>() {
+        .flatMap(new Func1<ExperimentInner, Observable<Experiment>>() {
             @Override
-            public Experiment call(ExperimentInner inner) {
-                return wrapModel(inner);
+            public Observable<Experiment> call(ExperimentInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Experiment)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/FileServersImpl.java b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/FileServersImpl.java
index f3e8452919fb..f9b4ff4de1d2 100644
--- a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/FileServersImpl.java
+++ b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/FileServersImpl.java
@@ -64,10 +64,14 @@ public FileServer call(FileServerInner inner) {
     public Observable<FileServer> getAsync(String resourceGroupName, String workspaceName, String fileServerName) {
         FileServersInner client = this.inner();
         return client.getAsync(resourceGroupName, workspaceName, fileServerName)
-        .map(new Func1<FileServerInner, FileServer>() {
+        .flatMap(new Func1<FileServerInner, Observable<FileServer>>() {
             @Override
-            public FileServer call(FileServerInner inner) {
-                return wrapModel(inner);
+            public Observable<FileServer> call(FileServerInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FileServer)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/JobsImpl.java b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/JobsImpl.java
index 598a0be5fb7f..9779df0af56f 100644
--- a/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/JobsImpl.java
+++ b/batchai/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/batchai/v2018_05_01/implementation/JobsImpl.java
@@ -109,10 +109,14 @@ public Job call(JobInner inner) {
     public Observable<Job> getAsync(String resourceGroupName, String workspaceName, String experimentName, String jobName) {
         JobsInner client = this.inner();
         return client.getAsync(resourceGroupName, workspaceName, experimentName, jobName)
-        .map(new Func1<JobInner, Job>() {
+        .flatMap(new Func1<JobInner, Observable<Job>>() {
             @Override
-            public Job call(JobInner inner) {
-                return wrapModel(inner);
+            public Observable<Job> call(JobInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Job)wrapModel(inner));
+                }
             }
        });
     }