CHG: Updated buffer size and error messages