Restored mapping for C++ exceptions to Java exceptions