[NTVDM]: Improve diagnostics.