Merge "Fix for startup NPE."