[IMP] Adjust error messages