diff --git a/kfreespace/kcm/kfreespaceconfig.cpp b/kfreespace/kcm/kfreespaceconfig.cpp
index 82d12667..7f34e47a 100644
--- a/kfreespace/kcm/kfreespaceconfig.cpp
+++ b/kfreespace/kcm/kfreespaceconfig.cpp
@@ -30,7 +30,6 @@
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 #include <solid/device.h>
-#include <solid/storagevolume.h>
 #include <solid/storageaccess.h>
 
 class KFreeSpaceBox : public QGroupBox
diff --git a/kfreespace/kded/kded_kfreespace.cpp b/kfreespace/kded/kded_kfreespace.cpp
index 54428cc0..7a31232d 100644
--- a/kfreespace/kded/kded_kfreespace.cpp
+++ b/kfreespace/kded/kded_kfreespace.cpp
@@ -19,7 +19,6 @@
 #include "kded_kfreespace.h"
 #include "kfreespace.h"
 
-#include <QTimer>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kconfiggroup.h>
@@ -27,7 +26,6 @@
 #include <kpluginfactory.h>
 #include <kdebug.h>
 #include <solid/device.h>
-#include <solid/storagevolume.h>
 #include <solid/storageaccess.h>
 #include <solid/devicenotifier.h>
 
diff --git a/kfreespace/kded/kfreespaceimpl.cpp b/kfreespace/kded/kfreespaceimpl.cpp
index 77747d80..068dbcfd 100644
--- a/kfreespace/kded/kfreespaceimpl.cpp
+++ b/kfreespace/kded/kfreespaceimpl.cpp
@@ -66,6 +66,11 @@ void KFreeSpaceImpl::timerEvent(QTimerEvent *event)
         const Solid::StorageAccess* solidaccess = m_soliddevice.as<Solid::StorageAccess>();
         Q_ASSERT(solidaccess);
         const QString mountpoint = solidaccess->filePath();
+        if (mountpoint.isEmpty()) {
+            kDebug() << "Device not mounted" << m_soliddevice.udi();
+            return;
+        }
+
         const KDiskFreeSpaceInfo kdiskinfo = KDiskFreeSpaceInfo::freeSpaceInfo(mountpoint);
         if (!kdiskinfo.isValid()) {
             kDebug() << "Disk info is not valid for" << mountpoint;