Merge "Make sure to actually return after jniThrowException"