Updated error message behavior to be consistent across entity functionality.