Merge "Fix incorrect null checks in 2 JVMTI functions"