eachsaj
diff --git a/‎google-cloud-testing/storage-benchwrapper/src/main/java/com/google/cloud/benchwrapper/Main.java‎
Lines changed: 0 additions & 7 deletions b/‎google-cloud-testing/storage-benchwrapper/src/main/java/com/google/cloud/benchwrapper/Main.java‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎google-cloud-testing/storage-benchwrapper/src/main/java/com/google/cloud/benchwrapper/StorageBenchWrapperImpl.java‎
Lines changed: 9 additions & 1 deletion b/‎google-cloud-testing/storage-benchwrapper/src/main/java/com/google/cloud/benchwrapper/StorageBenchWrapperImpl.java‎
Lines changed: 9 additions & 1 deletion
@@ -30,13 +30,6 @@ public static void main(String[] args) throws Exception {
     }
 
     String storageEmulatorHost = System.getenv("STORAGE_EMULATOR_HOST");
-    if (storageEmulatorHost == null || storageEmulatorHost.equals("")) {
-      // We could use system properties here too, but every other language uses
-      // an environment variable called STORAGE_EMULATOR_HOST, so the
-      // consistency is nice to maintain.
-      System.err.println("Please set STORAGE_EMULATOR_HOST=localhost:8080");
-      System.exit(1);
-    }
 
     System.out.println("Server starting up...");
 
 
@@ -32,10 +32,18 @@ class StorageBenchWrapperImpl extends StorageBenchWrapperImplBase {
   private Storage client;
 
   public StorageBenchWrapperImpl(String storageEmulatorHost) {
-    client = StorageOptions.newBuilder()
+    if (storageEmulatorHost == null || storageEmulatorHost.isEmpty()){
+      System.out.println("Initializing client against live service...");
+      client = StorageOptions.newBuilder()
+          .build()
+          .getService();
+    } else {
+      System.out.println("Initializing client against emulated service...");
+      client = StorageOptions.newBuilder()
         .setHost("http://" + storageEmulatorHost)
         .build()
         .getService();
+    }
   }
 
   public void write(ObjectWrite request, StreamObserver<EmptyResponse> responseObserver) {