Adds null checking to find statement