Resolving pending response handler bug