Error reporting improved