diff --git a/kmfolder.cpp b/kmfolder.cpp
index be5fe7c0c..afefd1e33 100644
--- a/kmfolder.cpp
+++ b/kmfolder.cpp
@@ -100,7 +100,7 @@ KMFolder :: ~KMFolder()
   /* Well, this is a problem. If I add the above line then kmfolder depends
    * on kmaccount and is then not that portable. Hmm.
    */
-  undoStack->folderDestroyed(this);
+  if (undoStack) undoStack->folderDestroyed(this);
 }
 
 
diff --git a/kmfoldermgr.cpp b/kmfoldermgr.cpp
index 372ca05f9..92f85adda 100644
--- a/kmfoldermgr.cpp
+++ b/kmfoldermgr.cpp
@@ -44,7 +44,7 @@ KMFolderMgr::KMFolderMgr(const QString& aBasePath):
 //-----------------------------------------------------------------------------
 KMFolderMgr::~KMFolderMgr()
 {
-  undoStack->clear(); // Speed things up a bit.
+  if (undoStack) undoStack->clear(); // Speed things up a bit.
   mBasePath = QString::null;;
 }