ErrorMessages added
JavaDoc added