Simplify requests error logic for better error reporting