more error handling and notifications