Merge pull request #458 from iamqizhao/master

Finish trace for premature error