REL-2121: NPE in TPE offset feature unload
Merge pull request #106 from swalker2m/feature/REL-2121

REL-2121: NPE in TPE offset feature unload