fix up some error handling
4 files changed