FB 5736: NPE in isSubscribed - refactoring merge gone wrong