TCR - improve error handling around bitrate selection

remove unrelated comment
Fix TCR fix.
Merge pull request #742 from mmccurdy07/tcr-fix

Cleaned up TCR fix.