Added forgotten non-null check