Enhanced null checking to combat issue in bug 4775