little bit more safety since verify can blow up
fix a long-standing bug of how to handle self hashname