Throwing expected message if current subscription not set
Fixed failing unit test, made it consistent with rest of error messages. Removed now redundant null check
Merge pull request #1956 from christav/throw-on-no-subscription

Throwing expected message if current subscription not set