check the router for null, if it disapeard between requests.
Merge remote-tracking branch 'lp-dev/Dev' into dev