Better error handling for Report api