Whitespace
Better route assertions - Fixes #2003