Start working on error handling