Null object fix in progress