Fix SE-474 - Added null verification to messageId