BZ-10318: null check fix