Just a tad more checks. Not entirely fullproof, since contexts in the DB without any config, will barf the system. And I think that may be OK, since it should be a no-situation.