null pointer check for subscription last updated
Merge remote-tracking branch 'origin/master'