Minor null check