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