Add an important null check...