Add some try/catch blocks for original message safety.