Merge "Fix JNI NULL class error"