Fix problem where notices cause logout problems
Don't force subkeys into objects that don't exist