D-16638: Better error message (Lauren Approved)