diff --git a/xml/errors.xml b/xml/errors.xml
index 591f73cd0..dc965f775 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -12,7 +12,7 @@
     <!-- PostgreSQL -->
     <dbms value="PostgreSQL">
         <error regexp="PostgreSQL.*ERROR"/>
-        <error regexp="Warning.*pg_.*"/>
+        <error regexp="Warning.*\Wpg_.*"/>
         <error regexp="valid PostgreSQL result"/>
         <error regexp="Npgsql\."/>
     </dbms>
@@ -38,8 +38,8 @@
         <error regexp="ORA-[0-9][0-9][0-9][0-9]"/>
         <error regexp="Oracle error"/>
         <error regexp="Oracle.*Driver"/>
-        <error regexp="Warning.*oci_.*"/>
-        <error regexp="Warning.*ora_.*"/>
+        <error regexp="Warning.*\Woci_.*"/>
+        <error regexp="Warning.*\Wora_.*"/>
     </dbms>
 
     <!-- DB2 -->