better escaping and more fault tolerant DAO