Request error handling
Fixes