Truncate too-long catch lines

Closes #506.
Code cleanup