Fixed 'Popped wrong request context' handling