page-subscription NPE
Merge pull request #1521 from clebertsuconic/2.2.eap5

avoiding a NPE. Found on support tickets