diff --git a/documentation/qthelp/kdevelop-qthelp.knsrc b/documentation/qthelp/kdevelop-qthelp.knsrc
--- a/documentation/qthelp/kdevelop-qthelp.knsrc
+++ b/documentation/qthelp/kdevelop-qthelp.knsrc
@@ -2,3 +2,4 @@
 ProvidersUrl=https://collect.kde.org/kdevelop-qthelp/providers.xml
 TargetDir=kdevelop-qthelp
 Uncompress=archive
+Categories=Miscelaneous
diff --git a/projectmanagers/cmake/settings/cmakepreferences.cpp b/projectmanagers/cmake/settings/cmakepreferences.cpp
--- a/projectmanagers/cmake/settings/cmakepreferences.cpp
+++ b/projectmanagers/cmake/settings/cmakepreferences.cpp
@@ -177,8 +177,11 @@
     const Path file = newBuildDir.isValid() ? Path(newBuildDir, "CMakeCache.txt") : Path();
     if(QFile::exists(file.toLocalFile()))
     {
-        m_currentModel->deleteLater();
-        m_currentModel=new CMakeCacheModel(this, file);
+        if (m_currentModel) {
+            m_currentModel->deleteLater();
+        }
+        m_currentModel = new CMakeCacheModel(this, file);
+
         configureCacheView();
         connect(m_currentModel, &CMakeCacheModel::itemChanged,
                 this, &CMakePreferences::cacheEdited);
@@ -190,8 +193,10 @@
     else
     {
         disconnect(m_prefsUi->cacheList->selectionModel(), &QItemSelectionModel::currentChanged, this, 0);
-        m_currentModel->deleteLater();
-        m_currentModel=0;
+        if (m_currentModel) {
+            m_currentModel->deleteLater();
+            m_currentModel = 0;
+        }
         configureCacheView();
     }