Null assignment fixed