Added some more protection from potential changes.