Add support for .fail and remove error interceptor