STREAMS-104 | Changed Exceptions caught to be broader