Add better error messages.