Added notes on error handling