diff --git a/jsc_custom/handler/share_handler.py b/jsc_custom/handler/share_handler.py
index d368334a489ce6060890c4493f155bde164d87a7..17a600eb315d2d23531503c3022e7180ede4b128 100644
--- a/jsc_custom/handler/share_handler.py
+++ b/jsc_custom/handler/share_handler.py
@@ -138,13 +138,13 @@ class R2DHandler(SpawnHandler):
         user_options["option"] = "repo2docker"
 
         args_unquote = [urllib.parse.unquote(x) for x in args]
+        user_options["repo2docker"]["repotype"] = repotype
 
         if len(arguments_dict_lower.get("name", [])) > 0:
             user_options["name"] = arguments_dict_lower.get("name")[0].decode("utf-8")
         else:
-            user_options["name"] = args_unquote[0]
+            user_options["name"] = "Unnamed"
 
-        user_options["repo2docker"]["repotype"] = repotype
         user_options["repo2docker"]["repourl"] = "/".join(args_unquote)
 
         # if "labpath" in self.request.arguments
@@ -187,9 +187,9 @@ class R2DHandler(SpawnHandler):
         # Check if persistent storage is required
         if len(arguments_dict_lower.get("localstoragepath", [])) > 0:
             user_options["storage"] = {
-                "localstoragepath": arguments_dict_lower.get("localstoragepath")[0].decode(
-                    "utf-8"
-                )
+                "localstoragepath": arguments_dict_lower.get("localstoragepath")[
+                    0
+                ].decode("utf-8")
             }
         elif "localstoragepath" in arguments_dict_lower.keys():
             user_options["storage"] = {"localstoragepath": "/home/jovyan/work"}