Fixed exception handling in |new|
auto-merge staging into master