Fixed uncatchable CRE.
Merge origin/master