Comment and error handling