Merge branch 'kvm-null-pointer-fix' into kvm-master