Better Error Handling

We punted on error handling before. This change gracefully handles 404 errors it receives from the API.