diff --git a/popaccount.cpp b/popaccount.cpp
index d9248af11..3bc21308b 100644
--- a/popaccount.cpp
+++ b/popaccount.cpp
@@ -491,9 +491,9 @@ void PopAccount::slotJobFinished() {
     if ( mLeaveOnServer && mUidForIdMap.isEmpty() &&
         mUidsOfNextSeenMsgsDict.isEmpty() && !idsOfMsgs.isEmpty() ) {
       KMessageBox::sorry(0, i18n("Your POP3 server (Account: %1) does not support "
-      "the UIDL command: this command is required to determine, in a reliable way, " 
-      "which of the mails on the server KMail has already seen before;\n" 
-      "the feature to leave the mails on the server will therefore not " 
+      "the UIDL command: this command is required to determine, in a reliable way, "
+      "which of the mails on the server KMail has already seen before;\n"
+      "the feature to leave the mails on the server will therefore not "
       "work properly.").arg(NetworkAccount::name()) );
       // An attempt to work around buggy pop servers, these seem to be popular.
       mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict;
@@ -811,7 +811,9 @@ void PopAccount::processRemainingQueuedMessages()
   processMsgsTimer.stop();
 
   stage = Quit;
-  kmkernel->folderMgr()->syncAllFolders();
+  if ( kmkernel && kmkernel->folderMgr() ) {
+    kmkernel->folderMgr()->syncAllFolders();
+  }
 }