Updates error handling and messaging