More graceful error handling