diff --git a/xml/errors.xml b/xml/errors.xml
index c298e4a5f..20f6b9d2c 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -23,9 +23,9 @@
     <dbms value="Microsoft SQL Server">
         <error regexp="Driver.* SQL[\-\_\ ]*Server"/>
         <error regexp="OLE DB.* SQL Server"/>
-        <error regexp="(\W|\A)SQL Server.*Driver"/>
+        <error regexp="\bSQL Server.*Driver"/>
         <error regexp="Warning.*mssql_.*"/>
-        <error regexp="(\W|\A)SQL Server.*[0-9a-fA-F]{8}"/>
+        <error regexp="\bSQL Server.*[0-9a-fA-F]{8}"/>
         <error regexp="(?s)Exception.*\WSystem\.Data\.SqlClient\."/>
         <error regexp="(?s)Exception.*\WRoadhouse\.Cms\."/>
     </dbms>
@@ -39,7 +39,7 @@
 
     <!-- Oracle -->
     <dbms value="Oracle">
-        <error regexp="ORA-[0-9][0-9][0-9][0-9]"/>
+        <error regexp="\bORA-[0-9][0-9][0-9][0-9]"/>
         <error regexp="Oracle error"/>
         <error regexp="Oracle.*Driver"/>
         <error regexp="Warning.*\Woci_.*"/>