[REFACTOR] Move events checking out from msg packing routines