Comma in ADO-MESSAGES macro
code cleanup & error propagation fixes