Add extra null check. [644]