Error reporting added