Bugfix - null check was missed in a refactor.