Improves error conditions.
Merge pull request #43 from nonolith/tcr-stopstream