Updated request handler
Added error templates