Interceptor and error handling clean up