Better error handling for routes
Add report handler