Tiny bugfix, which causes errors on error.
Added custom routing module which is pretty awesome