Added one null check