Fixed collapsing between error messages and system messages