STREAMS-104 | Moved reset into the try/catch