Feature/4994 improve error messages on client