Nullcheck on messages and update tokens