OF-784 Possible NullPointerException in MessageRouter logic