Merge remote-tracking branch 'origin/master'

platform/platform-impl/src/com/intellij/ide/startupWizard/StartupWizardModel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,9 @@ public class StartupWizardModel extends WizardModel {
     for (SelectPluginsStep step : myStepMap.values()) {
       step.fillPlugins();
     }
-    myOtherStep.fillPlugins();
+    if (myOtherStep != null) {
+      myOtherStep.fillPlugins();
+    }
   }
 
   @Nullable