diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py
index fe3906ccb1f62f4e06223392e7d5bdf6a6347829..5f7ff2f293fa4618a832b498a0b6dae73c9720aa 100644
--- a/indra/copy_win_scripts/start-client.py
+++ b/indra/copy_win_scripts/start-client.py
@@ -38,6 +38,10 @@ def start_client(grid, slurl, build_config, my_args):
 
 if __name__ == "__main__":
     grid = llstart.get_config("grid")
+    
+    if grid == None:
+        grid = "aditi"
+        
     build_config = llstart.get_config("build_config")
     my_args = llstart.get_config("viewer_args", force_dict = True)
     opts, args = getopt.getopt(sys.argv[1:], "u:r:f:g:i:h",
@@ -53,7 +57,7 @@ def start_client(grid, slurl, build_config, my_args):
             sys.exit(0)
             
     slurl = llstart.get_config("slurl")            
-    if slurl == "":
+    if slurl == None:
         if region is None:
             region = llstart.get_user_name()
         slurl = "//%s/128/128/" % (region)