diff --git a/Program.cs b/Program.cs
index 4f0df14..fe7d93e 100644
--- a/Program.cs
+++ b/Program.cs
@@ -99,7 +99,6 @@ static async Task<int> Main(string[] args)
             Console.ForegroundColor = ConsoleColor.DarkGray;
             Console.WriteLine($"Version Remote:     {remoteVersion}");
             Console.ResetColor();
-
             bool isOpen = false;
             do
             {
@@ -180,6 +179,7 @@ static async Task<int> Main(string[] args)
             if(arguments.Get<bool>("verbose"))
                 Console.WriteLine(ex.StackTrace);
             Console.ResetColor();
+            Finish();
             return ex.ErrorCode;
         } catch(Exception ex)
         {
@@ -188,16 +188,20 @@ static async Task<int> Main(string[] args)
             if(arguments.Get<bool>("verbose"))
                 Console.WriteLine(ex.StackTrace);
             Console.ResetColor();
+            Finish();
             return -1;
         }
 
+        Finish();
+        return code;
+    }
+
+    private void Finish()
+    {
         if(device != null)
             await device.Disconnect();
         if(conn != null)
             await conn.Disconnect();
-
-
-        return code;
     }