Improve Error reporting