diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index a60ba13cbac..ff990044a06 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -739,6 +739,9 @@ clang::format::FormatStyle ClangFormatBaseIndenter::styleForFile() const
             Utils::FilePath filePath = filePathToCurrentSettings(
                 TextEditor::TextEditorSettings::codeStyle("Cpp")->currentPreferences());
 
+            if (!filePath.exists())
+                return qtcStyle();
+
             clang::format::FormatStyle style;
             style.Language = clang::format::FormatStyle::LK_Cpp;
             const std::error_code error
diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp
index b85a1c22285..38cedb699db 100644
--- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp
@@ -346,7 +346,9 @@ void CppCodeStylePreferencesWidget::setVisualizeWhitespace(bool on)
 
 void CppCodeStylePreferencesWidget::addTab(CppCodeStyleWidget *page, QString tabName)
 {
-    QTC_ASSERT(page, return);
+    if (!page)
+        return;
+
     m_ui->categoryTab->addTab(page, tabName);
 
     connect(page, &CppEditor::CppCodeStyleWidget::codeStyleSettingsChanged,