Minor commit related to the last one (bypassing DBMS error trimming problem)