CIVI-7 Added and modified error messages, version changes