Yea. After the fact I realized I was being lazy and that I shouldn't muck with client scope locking. Fixed.