Fix for request exceptions