Make error messages more generic