[C++] Switch TRY/CATCH to real C++ try/catch by default again