Interface null check added