Error reporting improvement