Merge "Fix NPE in startup wizard caused by former change." into nyc-mr1-dev