Fixed the commenting and the exception handling in Transmitter
Merge branch 'stream'