diff --git a/gns3server/compute/base_node.py b/gns3server/compute/base_node.py
index a75bd71d..a0e4e10e 100644
--- a/gns3server/compute/base_node.py
+++ b/gns3server/compute/base_node.py
@@ -452,7 +452,7 @@ class BaseNode:
         """
 
         path = self._manager.config.get_section_config("Server").get("ubridge_path", "ubridge")
-        if path == "ubridge":
+        if path == "ubridge" or path == "None":
             path = shutil.which("ubridge")
 
         if path is None or len(path) == 0:
@@ -480,6 +480,9 @@ class BaseNode:
         Starts uBridge (handles connections to and from this node).
         """
 
+        if self.ubridge_path is None:
+            raise NodeError("uBridge is not available")
+
         if not self._manager.has_privileged_access(self.ubridge_path):
             raise NodeError("uBridge requires root access or capability to interact with network adapters")
 
diff --git a/gns3server/controller/topology.py b/gns3server/controller/topology.py
index 2deb1aa4..ae842069 100644
--- a/gns3server/controller/topology.py
+++ b/gns3server/controller/topology.py
@@ -216,6 +216,9 @@ def _convert_1_3_later(topo):
             node["node_type"] = "virtualbox"
             if node["symbol"] is None:
                 node["symbol"] = ":/symbols/vbox_guest.svg"
+        elif old_node["type"] == "Cloud":
+            node["node_type"] = "cloud"
+            node["symbol"] = ":/symbols/cloud.svg"
         else:
             raise NotImplementedError("Conversion of {} is not supported".format(old_node["type"]))