Add some extra error handling

Test Plan:
- None