diff --git a/plugins/genericprojectmanager/genericmanagerlistjob.cpp b/plugins/genericprojectmanager/genericmanagerlistjob.cpp
index c838ff99a5..c9b0e01c3d 100644
--- a/plugins/genericprojectmanager/genericmanagerlistjob.cpp
+++ b/plugins/genericprojectmanager/genericmanagerlistjob.cpp
@@ -1,89 +1,92 @@
 /* This file is part of KDevelop
     Copyright 2009  Radu Benea <radub82@gmail.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "genericmanagerlistjob.h"
 
 #include <interfaces/iproject.h>
 #include <project/projectmodel.h>
 
 #include <KDebug>
 
 GenericManagerListJob::GenericManagerListJob(KDevelop::ProjectFolderItem* item) : KIO::Job(), m_project(item->project())
 {
     m_topUrl = item->url();
 
     /* the following line is not an error in judgement, apparently starting a
      * listJob while the previous one hasn't self-destructed takes a lot of time,
      * so we give the job a chance to selfdestruct first */
     connect( this, SIGNAL(nextJob()), SLOT(startNextJob()), Qt::QueuedConnection );
 
     KIO::ListJob* job = KIO::listDir( item->url(), KIO::HideProgressInfo );
 
     connect( job, SIGNAL(entries(KIO::Job*, KIO::UDSEntryList)),
              this, SLOT(slotEntries(KIO::Job*, KIO::UDSEntryList)) );
 
     connect( job, SIGNAL(result(KJob*)), SLOT(slotResult(KJob*)) );
 }
 
 KDevelop::IProject* GenericManagerListJob::project()
 {
     return m_project;
 }
 
 KUrl GenericManagerListJob::url()
 {
     return m_topUrl;
 }
 
 void GenericManagerListJob::addSubDir( KDevelop::ProjectFolderItem* item )
 {
     m_listQueue.enqueue(item);
 }
 
 void GenericManagerListJob::slotEntries(KIO::Job* job, const KIO::UDSEntryList& entriesIn)
 {
     entryList.append(entriesIn);
 }
 
 void GenericManagerListJob::startNextJob()
 {
+    if ( m_listQueue.isEmpty() ) {
+        return;
+    }
     KIO::ListJob* job = KIO::listDir( m_listQueue.dequeue()->url(), KIO::HideProgressInfo );
     connect( job, SIGNAL(entries(KIO::Job*, KIO::UDSEntryList)),
              this, SLOT(slotEntries(KIO::Job*, KIO::UDSEntryList)) );
     connect( job, SIGNAL(result(KJob*)), SLOT(slotResult(KJob*)) );
 }
 
 void GenericManagerListJob::slotResult(KJob* job)
 {
     KIO::SimpleJob* simpleJob(dynamic_cast<KIO::SimpleJob*>(job));
     emit entries(m_project, simpleJob->url(), entryList);
     entryList.clear();
 
     if( job->error() ) {
         kDebug() << "error in list job:" << job->error() << job->errorString();
     }
 
     if( m_listQueue.isEmpty() ) {
         emitResult();
     } else {
         emit nextJob();
     }
 }
 
 #include "genericmanagerlistjob.moc"