Improve exception handling, get rid of blanket "catch Exception" blocks