Added additional error handling for Find returning nil