Merge "Add null check to CheckVirtualMethod"