Add safety against broken links
Merge branch 'master' of git://github.com/flack/openpsa