cleanup, getting exceptions to work right when queries dont