diff --git a/gns3server/modules/base_vm.py b/gns3server/modules/base_vm.py
index 77af7976..891c77c2 100644
--- a/gns3server/modules/base_vm.py
+++ b/gns3server/modules/base_vm.py
@@ -72,7 +72,6 @@ class BaseVM:
 
     def __del__(self):
 
-        self.close()
         if self._temporary_directory is not None:
             if os.path.exists(self._temporary_directory):
                 shutil.rmtree(self._temporary_directory, ignore_errors=True)
diff --git a/gns3server/server.py b/gns3server/server.py
index c472188d..cc0e1f53 100644
--- a/gns3server/server.py
+++ b/gns3server/server.py
@@ -103,10 +103,9 @@ class Server:
 
     def _signal_handling(self):
 
-        @asyncio.coroutine
         def signal_handler(signame):
             log.warning("Server has got signal {}, exiting...".format(signame))
-            yield from self.shutdown_server()
+            asyncio.async(self.shutdown_server())
 
         signals = ["SIGTERM", "SIGINT"]
         if sys.platform.startswith("win"):
@@ -115,7 +114,7 @@ class Server:
             signals.extend(["SIGHUP", "SIGQUIT"])
 
         for signal_name in signals:
-            callback = functools.partial(asyncio.async, signal_handler(signal_name))
+            callback = functools.partial(signal_handler, signal_name)
             if sys.platform.startswith("win"):
                 # add_signal_handler() is not yet supported on Windows
                 signal.signal(getattr(signal, signal_name), callback)