Fix settings NPE from merge derp