Merge "Fix NPE with missing DPMI"