Fixed #809 -- switch back to always using UnsupportedAlgorithm
Address most of my own comments
Add additional reason tags