Bugfix: prevent issue if oldHelperNumberLayer is null