diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index dfa9936fb5f14ecb7efa8ef59e9c67ca15d016f3..903d7cca9d03114ffdbe8a45c46291d3e9402498 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -166,8 +166,11 @@ void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &la
 
 void DebuggerUISwitcher::setActiveLanguage(const QString &langName)
 {
-    if (theDebuggerAction(SwitchLanguageAutomatically)->isChecked())
+    if (theDebuggerAction(SwitchLanguageAutomatically)->isChecked()
+        && d->m_languages.contains(langName))
+    {
         changeDebuggerUI(langName);
+    }
 }
 
 int DebuggerUISwitcher::activeLanguageId() const
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 02bab91ae6dd948a6cbed498ec1350624f4a406a..1d8c8414c755638e2f37418f7f43d79992219dc1 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -52,8 +52,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <QtCore/QStringList>
 #include <QtCore/QtPlugin>
 #include <QtCore/QTimer>