Fix NPE during MS startup.