Error Handling Unsubscribe and Terminal State
Merge pull request #1669 from benjchristensen/unsubscribe-in-error-handlers

Error Handling Unsubscribe and Terminal State