#107 Updated error messages.