diff --git a/language/backgroundparser/parseprojectjob.cpp b/language/backgroundparser/parseprojectjob.cpp
index 8b83a903a9..cf5fa34f52 100644
--- a/language/backgroundparser/parseprojectjob.cpp
+++ b/language/backgroundparser/parseprojectjob.cpp
@@ -1,141 +1,146 @@
 /*
    Copyright 2009 David Nolden <david.nolden.kdevelop@art-master.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    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 "parseprojectjob.h"
 #include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
 #include <interfaces/iruncontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/iprojectcontroller.h>
 #include <language/backgroundparser/backgroundparser.h>
 #include <interfaces/iproject.h>
 #include <klocalizedstring.h>
 #include <interfaces/icompletionsettings.h>
 #include <QApplication>
 
 using namespace KDevelop;
 
 bool ParseProjectJob::doKill() {
     kDebug() << "stopping project parse job";
     deleteLater();
     return true;
 }
 
 ParseProjectJob::~ParseProjectJob() {
     ICore::self()->languageController()->backgroundParser()->revertAllRequests(this);
 
     if(ICore::self()->runController()->currentJobs().contains(this))
         ICore::self()->runController()->unregisterJob(this);
 }
 
 ParseProjectJob::ParseProjectJob(IProject* project, bool forceUpdate)
     : m_updated(0)
     , m_forceUpdate(forceUpdate)
     , m_project(project)
 {
     connect(project, SIGNAL(destroyed(QObject*)), SLOT(deleteNow()));
 
     if (!ICore::self()->projectController()->parseAllProjectSources()) {
         // In case we don't want to parse the whole project, still add all currently open files that belong to the project to the background-parser
         for (auto document: ICore::self()->documentController()->openDocuments()) {
             const auto path = IndexedString(document->url());
             if (project->fileSet().contains(path)) {
                 m_filesToParse.insert(path);
             }
         }
     } else {
         m_filesToParse = project->fileSet();
     }
 
     setCapabilities(Killable);
 
     setObjectName(i18np("Process 1 file in %2","Process %1 files in %2", m_filesToParse.size(), m_project->name()));
 }
 
 void ParseProjectJob::deleteNow() {
     delete this;
 }
 
 void ParseProjectJob::updateProgress() {
 
 }
 
 void ParseProjectJob::updateReady(const IndexedString& url, ReferencedTopDUContext topContext) {
     Q_UNUSED(url);
     Q_UNUSED(topContext);
     ++m_updated;
     if(m_updated % ((m_filesToParse.size() / 100)+1) == 0)
         updateProgress();
 
     if(m_updated >= m_filesToParse.size())
         deleteLater();
 }
 
 void ParseProjectJob::start() {
     if (ICore::self()->shuttingDown()) {
         return;
     }
 
+    if (m_filesToParse.isEmpty()) {
+        deleteLater();
+        return;
+    }
+
     kDebug() << "starting project parse job";
 
     TopDUContext::Features processingLevel = m_filesToParse.size() < ICore::self()->languageController()->completionSettings()->minFilesForSimplifiedParsing() ?
                                     TopDUContext::VisibleDeclarationsAndContexts : TopDUContext::SimplifiedVisibleDeclarationsAndContexts;
 
     if (m_forceUpdate) {
         if (processingLevel & TopDUContext::VisibleDeclarationsAndContexts) {
             processingLevel = TopDUContext::AllDeclarationsContextsAndUses;
         }
         processingLevel = (TopDUContext::Features)(TopDUContext::ForceUpdate | processingLevel);
     }
 
     if (auto currentDocument = ICore::self()->documentController()->activeDocument()) {
         const auto path = IndexedString(currentDocument->url());
         if (m_filesToParse.contains(path)) {
             ICore::self()->languageController()->backgroundParser()->addDocument(path, TopDUContext::AllDeclarationsContextsAndUses, BackgroundParser::BestPriority, this);
             m_filesToParse.remove(path);
         }
     }
 
     // Add all currently open files that belong to the project to the background-parser, so that they'll be parsed first of all
     for (auto document: ICore::self()->documentController()->openDocuments()) {
         const auto path = IndexedString(document->url());
         if (m_filesToParse.contains(path)) {
             ICore::self()->languageController()->backgroundParser()->addDocument(path, TopDUContext::AllDeclarationsContextsAndUses, 10, this );
             m_filesToParse.remove(path);
         }
     }
 
     if (!ICore::self()->projectController()->parseAllProjectSources()) {
         return;
     }
 
     // prevent UI-lockup by processing events after some files
     // esp. noticeable when dealing with huge projects
     const int processAfter = 1000;
     int processed = 0;
     foreach(const IndexedString& url, m_filesToParse) {
         ICore::self()->languageController()->backgroundParser()->addDocument( url, processingLevel, BackgroundParser::InitialParsePriority, this );
         ++processed;
         if (processed == processAfter) {
             QApplication::processEvents();
             processed = 0;
         }
     }
 }
 
 #include "parseprojectjob.moc"