Additional comments and error handling