diff --git a/kmacctcachedimap.cpp b/kmacctcachedimap.cpp
index 1be53b055..6eae360f2 100644
--- a/kmacctcachedimap.cpp
+++ b/kmacctcachedimap.cpp
@@ -383,14 +383,14 @@ void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
 //-----------------------------------------------------------------------------
 void KMAcctCachedImap::addDeletedFolder( KMFolder* folder )
 {
-  if ( folder->folderType() != KMFolderTypeCachedImap )
+  if ( !folder || folder->folderType() != KMFolderTypeCachedImap )
     return;
   KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>(folder->storage());
   addDeletedFolder( storage->imapPath() );
   kDebug(5006) << k_funcinfo << storage->imapPath() << endl;
 
   // Add all child folders too
-  if( folder && folder->child() ) {
+  if( folder->child() ) {
     QList<KMFolderNode*>::const_iterator it;
     for ( it = folder->child()->constBegin();
         it != folder->child()->constEnd();