Added new error messages to UI enhancement