Dealing with null settings and other problem cases

Like when the singleton works against us, right after an update.