diff --git a/currentGitHash.txt b/currentGitHash.txt
index 11d8545ac1..aafe16cb1f 100644
--- a/currentGitHash.txt
+++ b/currentGitHash.txt
@@ -1 +1 @@
-f63458c2e3732e7b788bc3056ddea4a71dc6be7d
+bc6a0cd141f7087ae277432dde42aacc604abc22
diff --git a/hi_backend/backend/currentGit.h b/hi_backend/backend/currentGit.h
index c382928f81..ba074b8952 100644
--- a/hi_backend/backend/currentGit.h
+++ b/hi_backend/backend/currentGit.h
@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "f63458c2e3732e7b788bc3056ddea4a71dc6be7d" 
+#define PREVIOUS_HISE_COMMIT "bc6a0cd141f7087ae277432dde42aacc604abc22" 
diff --git a/hi_core/hi_core/StandaloneProcessor.cpp b/hi_core/hi_core/StandaloneProcessor.cpp
index 8d842da9ed..4a5f5d404c 100644
--- a/hi_core/hi_core/StandaloneProcessor.cpp
+++ b/hi_core/hi_core/StandaloneProcessor.cpp
@@ -219,8 +219,29 @@ StandaloneProcessor::StandaloneProcessor()
 	ScopedPointer<XmlElement> xml = AudioProcessorDriver::getSettings();
 
 #if USE_BACKEND
-	if(!CompileExporter::isExportingFromCommandLine()) 
+	if(!CompileExporter::isExportingFromCommandLine())
+	{
+		if(xml != nullptr)
+		{
+			BigInteger numOutputChannels;
+
+			numOutputChannels.parseString(xml->getStringAttribute("audioDeviceOutChans"), 2);
+
+			auto numOutputsInDeviceSetting = numOutputChannels.countNumberOfSetBits();
+
+			if(numOutputsInDeviceSetting != HISE_NUM_STANDALONE_OUTPUTS)
+			{
+				if(PresetHandler::showYesNoWindow("Channel amount mismatch", "The number of channels used in the audio device settings do not match the amount of channels defined by `HISE_NUM_STANDALONE_OUTPUTS`.  \nPress OK to remove the xml file and initialise the default value."))
+				{
+					AudioProcessorDriver::getDeviceSettingsFile().deleteFile();
+					xml = nullptr;
+				}
+			}
+		}
+
 		dynamic_cast<AudioProcessorDriver*>(wrappedProcessor.get())->initialiseAudioDriver(xml);
+	}
+		
 #else
 	
     auto apd = dynamic_cast<AudioProcessorDriver*>(wrappedProcessor.get());
diff --git a/hi_tools/mcl_editor/code_editor/TextEditor.cpp b/hi_tools/mcl_editor/code_editor/TextEditor.cpp
index b5eeed695b..84e616e82b 100644
--- a/hi_tools/mcl_editor/code_editor/TextEditor.cpp
+++ b/hi_tools/mcl_editor/code_editor/TextEditor.cpp
@@ -160,7 +160,7 @@ void TextEditor::setNewTokenCollectionForAllChildren(Component* any, const Ident
 
 	Component::callRecursive<TextEditor>(top, [&](TextEditor* t)
 	{
-		if(t->languageManager->getLanguageId() == languageId)
+		if(t->languageManager->getLanguageId() == languageId && newCollection != nullptr)
 		{
 			t->tokenCollection = newCollection;
 			newCollection->addListener(t);