- Extract method
- Null check on subscription request
Merge remote-tracking branch 'origin/master'