- Adding error handling