making displayed URLs break gracefully, cont.
Merge pull request #165 from jensopetersen/master

making displayed URLs break gracefully, cont.