Fix for post-pended NULL route