More elaborate error messages and removed argument.