Adding better error messages.