Fix #446 - don't pass 404 handler through to other middleware.
Merge pull request #468 from humphd/issue446

Fix #446 - don't pass 404 handler through to other middleware.