Added NullCheck