settings are now null safe