Use SubprocessError to catch Subprocess exceptions.

gns3server/modules/virtualbox/__init__.py

@@ -717,10 +717,8 @@ class VirtualBox(IModule):
 
         try:
             result = subprocess.check_output(command, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
-        except subprocess.CalledProcessError as e:
+        except subprocess.SubprocessError as e:
             raise VirtualBoxError("Could not execute VBoxManage {}".format(e))
-        except subprocess.TimeoutExpired:
-            raise VirtualBoxError("VBoxManage has timed out")
         return result
 
     @IModule.route("virtualbox.vm_list")

gns3server/modules/virtualbox/virtualbox_vm.py

@@ -558,8 +558,8 @@ class VirtualBoxVM(object):
                 raise VirtualBoxError("{}".format(virtualbox_error))
             else:
                 raise VirtualBoxError("{}".format(e))
-        except subprocess.TimeoutExpired:
-            raise VirtualBoxError("VBoxManage has timed out")
+        except subprocess.SubprocessError as e:
+            raise VirtualBoxError("Could not execute VBoxManage: {}".format(e))
         return result.splitlines()
 
     def _get_vm_info(self):