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

Added a null check as we should not find null entries. #318