Another attempt at fixing unhandled routes.
Merge branch 'fix/unhandled' into hone