added 404 and 500 TODOs