Fix: Possibly null ref caused by the last commit.