diff --git a/offlineimap/init.py b/offlineimap/init.py
index 639c1b9..db71c54 100644
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@@ -379,7 +379,7 @@ class OfflineImap(object):
         activeaccountnames = self.config.get("general", "accounts")
         if options.accounts:
             activeaccountnames = options.accounts
-        activeaccountnames = activeaccountnames.split(",")
+        activeaccountnames = [x.lstrip() for x in activeaccountnames.split(",")]
 
         allaccounts = accounts.getaccountlist(self.config)
         for accountname in activeaccountnames:
diff --git a/offlineimap/repository/IMAP.py b/offlineimap/repository/IMAP.py
index a1fa8ba..17655d5 100644
--- a/offlineimap/repository/IMAP.py
+++ b/offlineimap/repository/IMAP.py
@@ -66,13 +66,12 @@ class IMAPRepository(BaseRepository):
         self.kathread.start()
 
     def stopkeepalive(self):
-        if not hasattr(self, 'kaevent'):
-            # Keepalive is not active.
-            return
+        if self.kaevent is None:
+            return # Keepalive is not active.
 
         self.kaevent.set()
-        del self.kathread
-        del self.kaevent
+        self.kathread = None
+        self.kaevent = None
 
     def holdordropconnections(self):
         if not self.getholdconnectionopen():