Added in null guards.