misc cleanup
raise exceptions rather than rendered errors