Attempt to fix a possible NPE in the face of ChickenBones' hackery. ChickenBones. stop it!