Add error handling to the router
Fixed html handler
Hacky fix for router's regexes