Fixed case where router would not get 'null' message.