trap exceptions, improve output
update for lein 2