#6 Fixed displaying of errors