diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 7375a5c3..03bb6fcb 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -315,6 +315,11 @@ public class App {
         try {
             manager.checkAccountState();
         } catch (IOException e) {
+            try {
+                manager.close();
+            } catch (IOException ie) {
+                logger.warn("Failed to close broken account", ie);
+            }
             throw new IOErrorException("Error while checking account " + username + ": " + e.getMessage(), e);
         }