1 files changed, 2 insertions, 1 deletions
diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index a7179079a..31a887cc7 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -301,6 +301,7 @@ public:
  */
 void ClearErrorMessages()
 {
+	UnshowCriticalError();
 	_errors.clear();
 }
 
@@ -322,7 +323,7 @@ void ShowFirstError()
 void UnshowCriticalError()
 {
 	ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
-	if (w != NULL) {
+	if (_window_system_initialized && w != NULL) {
 		if (w->IsCritical()) _errors.push_front(*w);
 		_window_system_initialized = false;
 		delete w;