Error messages bug fixed