- added null check (fixes #4351)