Improved error handling for report; Updates as per feedback