Bug 804776 - Remove conditional catch statements
Merge pull request #1461 from jsantell/804776-remove-conditional-catch

Closes Bug 804776 - Remove conditional catch statements, r=@zombie