Adjusted error handling and reporting