[bug 766394] Fixed issues from PR.

This includes some comment updates and checking for bitly
exceptions instead of generic ones.