Added additional error messages.