Move configuration after second null check instead of within.