diff --git a/kfreespace/kcm/kfreespaceconfig.cpp b/kfreespace/kcm/kfreespaceconfig.cpp
index e2eae8fd..bd895e91 100644
--- a/kfreespace/kcm/kfreespaceconfig.cpp
+++ b/kfreespace/kcm/kfreespaceconfig.cpp
@@ -196,10 +196,11 @@ void KCMFreeSpace::load()
         const QLayoutItem* layoutitem = m_layout->itemAt(i);
         if (layoutitem == m_spacer) {
             delete m_layout->takeAt(i);
+            m_spacer = nullptr;
             break;
         }
     }
-    m_spacer = nullptr;
+    Q_ASSERT(m_spacer == nullptr);
 
     KConfig kfreespaceconfig("kfreespacerc", KConfig::SimpleConfig);
     foreach (const Solid::Device soliddevice, Solid::Device::allDevices()) {
diff --git a/kfreespace/kcm/kfreespaceconfig.h b/kfreespace/kcm/kfreespaceconfig.h
index fade2cd7..694a2796 100644
--- a/kfreespace/kcm/kfreespaceconfig.h
+++ b/kfreespace/kcm/kfreespaceconfig.h
@@ -28,7 +28,7 @@
 class KFreeSpaceBox;
 
 /**
- * Control look of KDE greeter
+ * Control KDE free space notifier
  *
  * @author Ivailo Monev (xakepa10@gmail.com)
  */