Fix comments and error message