Begun Fixing Config With Null Checks