Add (slightly) clearer error messages