Merge remote-tracking branch 'origin/master' into 2.1

gns3server/controller/__init__.py

@@ -154,7 +154,7 @@ class Controller:
                                                              password=server_config.get("password", ""),
                                                              force=True)
         except aiohttp.web_exceptions.HTTPConflict as e:
-            log.fatal("Can't acces to the local server, make sure anything else is not running on the same port")
+            log.fatal("Can't access to the local server, make sure anything else is not running on the same port")
             sys.exit(1)
         for c in computes:
             try:
@@ -249,7 +249,7 @@ class Controller:
             self.gns3vm.settings = data["gns3vm"]
 
         self.load_appliances()
-        return data["computes"]
+        return data.get("computes", [])
 
     @asyncio.coroutine
     def load_projects(self):

gns3server/controller/project.py

@@ -738,7 +738,7 @@ class Project:
                         f.write(data)
                 with open(os.path.join(tmpdir, "project.gns3p"), "rb") as f:
                     project = yield from import_project(self._controller, str(uuid.uuid4()), f, location=location, name=name, keep_compute_id=True)
-        except OSError as e:
+        except (OSError, UnicodeEncodeError) as e:
             raise aiohttp.web.HTTPConflict(text="Can not duplicate project: {}".format(str(e)))
 
         if previous_status == "closed":