Refactor addMessage/addError to more succinct & standardised api