fix/Missing null check