Added checks to highlighting methods

just in case.