FB 5736: NPE in isSubscribed - refactoring merge gone wrong
Merge pull request #46 from maksimov/develop

FB 5736: NPE in isSubscribed - refactoring merge gone wrong