STREAMS-104 | Changed Exceptions caught to be broader
STREAMS-104 | Moved reset into the try/catch
Merge remote-tracking branch 'apache/master'