diff --git a/DB/ImageDB.cpp b/DB/ImageDB.cpp
index 6262d8b4..8423b344 100644
--- a/DB/ImageDB.cpp
+++ b/DB/ImageDB.cpp
@@ -1,194 +1,198 @@
 /* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program 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
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 #include "ImageDB.h"
 #include "XMLDB/Database.h"
 #include <KLocalizedString>
 #include <qfileinfo.h>
 #include "Browser/BrowserWidget.h"
 #include "DB/CategoryCollection.h"
 #include <qapplication.h>
 #include "NewImageFinder.h"
 #include <DB/MediaCount.h>
 #include <QProgressDialog>
 #include <DB/FileName.h>
+#include "Logging.h"
 
 using namespace DB;
 
 ImageDB* ImageDB::s_instance = nullptr;
 
 ImageDB* DB::ImageDB::instance()
 {
     if ( s_instance == nullptr )
+    {
+        qCWarning(DBLog) << "ImageDB is null.";
         exit(0); // Either we are closing down or ImageDB::instance was called before ImageDB::setup
+    }
     return s_instance;
 }
 
 void ImageDB::setupXMLDB( const QString& configFile )
 {
     if (s_instance)
         qFatal("ImageDB::setupXMLDB: Setup must be called only once.");
     s_instance = new XMLDB::Database( configFile );
     connectSlots();
 }
 
 void ImageDB::deleteInstance()
 {
     delete s_instance;
     s_instance = nullptr;
 }
 
 void ImageDB::connectSlots()
 {
     connect( Settings::SettingsData::instance(), SIGNAL(locked(bool,bool)), s_instance, SLOT(lockDB(bool,bool)) );
     connect( &s_instance->memberMap(), SIGNAL(dirty()), s_instance, SLOT(markDirty()));
 }
 
 QString ImageDB::NONE()
 {
     static QString none = QString::fromLatin1("**NONE**");
     return none;
 }
 
 DB::FileNameList ImageDB::currentScope(bool requireOnDisk) const
 {
     return search( Browser::BrowserWidget::instance()->currentContext(), requireOnDisk );
 }
 
 void ImageDB::markDirty()
 {
     emit dirty();
 }
 
 void ImageDB::setDateRange( const ImageDate& range, bool includeFuzzyCounts )
 {
     m_selectionRange = range;
     m_includeFuzzyCounts = includeFuzzyCounts;
 }
 
 void ImageDB::clearDateRange()
 {
     m_selectionRange = ImageDate();
 }
 
 void ImageDB::slotRescan()
 {
     bool newImages = NewImageFinder().findImages();
     if ( newImages )
         markDirty();
 
     emit totalChanged( totalCount() );
 }
 
 void ImageDB::slotRecalcCheckSums(const DB::FileNameList& inputList)
 {
     DB::FileNameList list = inputList;
     if (list.isEmpty()) {
         list = images();
         md5Map()->clear();
     }
 
     bool d = NewImageFinder().calculateMD5sums( list, md5Map() );
     if ( d )
         markDirty();
 
     emit totalChanged( totalCount() );
 }
 
 DB::FileNameSet DB::ImageDB::imagesWithMD5Changed()
 {
     MD5Map map;
     bool wasCanceled;
     NewImageFinder().calculateMD5sums(images(), &map, &wasCanceled);
     if ( wasCanceled )
         return DB::FileNameSet();
 
     return md5Map()->diff( map );
 }
 
 
 ImageDB::ImageDB()
 {
 }
 
 DB::MediaCount ImageDB::count( const ImageSearchInfo& searchInfo )
 {
     uint images = 0;
     uint videos = 0;
     for (const DB::FileName& fileName : search(searchInfo)) {
         if ( info(fileName)->mediaType() == Image )
             ++images;
         else
             ++videos;
     }
     return MediaCount( images, videos );
 }
 
 void ImageDB::slotReread( const DB::FileNameList& list, DB::ExifMode mode)
 {
 // Do here a reread of the exif info and change the info correctly in the database without loss of previous added data
     QProgressDialog  dialog( i18n("Loading information from images"),
                              i18n("Cancel"), 0, list.count() );
 
     uint count=0;
     for( DB::FileNameList::ConstIterator it = list.begin(); it != list.end(); ++it, ++count  ) {
         if ( count % 10 == 0 ) {
             dialog.setValue( count ); // ensure to call setProgress(0)
             qApp->processEvents( QEventLoop::AllEvents );
 
             if ( dialog.wasCanceled() )
                 return;
         }
 
         QFileInfo fi( (*it).absolute() );
 
         if (fi.exists())
             info(*it)->readExif(*it, mode);
         markDirty();
     }
 }
 
 DB::FileName ImageDB::findFirstItemInRange(const DB::FileNameList& images,
                                            const ImageDate& range,
                                            bool includeRanges) const
 {
     DB::FileName candidate;
     QDateTime candidateDateStart;
     for (const DB::FileName& fileName : images) {
         ImageInfoPtr iInfo = info(fileName);
 
         ImageDate::MatchType match = iInfo->date().isIncludedIn(range);
         if (match == DB::ImageDate::ExactMatch ||
             (includeRanges && match == DB::ImageDate::RangeMatch)) {
             if (candidate.isNull() ||
                 iInfo->date().start() < candidateDateStart) {
                 candidate = fileName;
                 // Looking at this, can't this just be iInfo->date().start()?
                 // Just in the middle of refactoring other stuff, so leaving
                 // this alone now. TODO(hzeller): revisit.
                 candidateDateStart = info(candidate)->date().start();
             }
         }
     }
     return candidate;
 }
 
 /** \fn void ImageDB::renameCategory( const QString& oldName, const QString newName )
  * \brief Rename category in media items stored in database.
  */
 
 // vi:expandtab:tabstop=4 shiftwidth=4: