attempt to clean up some remaining db exceptions