Fix/improve how message/warning is shown