removed checking for router null