added a null check as we should not find null entries.

added a null check as we should not find null entries. #317