Fix error message generation