A......... [ZBXNEXT-1133] minor coding style and error message corrections