Implemented review comments to send error message