Update obsolete class
Null check