Added a couple of isset checks to previous component part author commit.