DAO changes for some runtime exceptions