updates interceptor to conform with behaviour
makes interceptor call protocol_error directly
updates callback to match behaviour
Merge bug26120