Fix error propagation on some requests