diff --git a/uppsrc/ide/Setup.cpp b/uppsrc/ide/Setup.cpp
index 81507389f..021b2faa9 100644
--- a/uppsrc/ide/Setup.cpp
+++ b/uppsrc/ide/Setup.cpp
@@ -658,6 +658,14 @@ void Ide::SetupFormat() {
 	FileSetTime(ConfigFile("version"), ToTime(~ide.showtimeafter));
 	FinishConfig();
 	SaveConfig();
+	
+	for(int cpp = 0; cpp < 2; cpp++) {
+		Clang h;
+		if(!h.Parse(GetHomeDirFile(cpp ? "test.cpp" : "test.c"), "", GetCurrentIncludePath(), GetCurrentDefines(), 0)) {
+			Exclamation("libclang additional compiler options do not seem do be correct. Assist might not work.");
+			return;
+		}
+	}
 }
 
 void Ide::FinishConfig()
diff --git a/uppsrc/ide/clang/CurrentFile.cpp b/uppsrc/ide/clang/CurrentFile.cpp
index 700c77451..18dc10867 100644
--- a/uppsrc/ide/clang/CurrentFile.cpp
+++ b/uppsrc/ide/clang/CurrentFile.cpp
@@ -167,18 +167,6 @@ void CurrentFileThread()
 					current_file_parsing = false;
 					was_parsing = true;
 				}
-				if(!cfc.clang.tu) {
-					{
-						GuiLock __;
-						IdeShowConsole();
-						PutConsole("libclang parser has failed, please fix libclang options");
-					}
-					String h = LibClangCommandLine();
-					while(h == LibClangCommandLine()) {
-						Sleep(500);
-						if(Thread::IsShutdownThreads()) break;
-					}
-				}
 				if(Thread::IsShutdownThreads()) break;
 				if(cfc.clang.tu && autocomplete_do) {
 					Vector<AutoCompleteItem> item;