[master] revert exception catch