Merge pull request #492 from iamqizhao/master

Add missing trace finish on an uncommon code path