Reduce conditional nesting in bin/hs and improve error output