diff --git a/actionscheduler.cpp b/actionscheduler.cpp
index b8892af32..72d11b62b 100644
--- a/actionscheduler.cpp
+++ b/actionscheduler.cpp
@@ -837,7 +837,8 @@ void ActionScheduler::timeOut()
 void ActionScheduler::fetchTimeOut()
 {
   // Note: This is a good place for a debug statement
-  assert( lastJob );
+  if( !lastJob )
+    return;
   // sometimes imap jobs seem to just stall so give up and move on
   disconnect( lastJob, SIGNAL(messageRetrieved( KMMessage* )),
               this, SLOT(messageFetched( KMMessage* )) );
diff --git a/actionscheduler.h b/actionscheduler.h
index f4ae80b94..727e665cf 100644
--- a/actionscheduler.h
+++ b/actionscheduler.h
@@ -39,6 +39,7 @@
 
 #include <QList>
 #include <QTime>
+#include <QPointer>
 
 class KMHeaders;
 
@@ -190,7 +191,7 @@ private:
   QTimer *timeOutTimer, *fetchTimeOutTimer;
   QTime timeOutTime, fetchTimeOutTime;
   KMCommand *lastCommand;
-  FolderJob *lastJob;
+  QPointer<FolderJob> lastJob;
 };
 
 }