Move more DBIC code into a try{} block