diff --git a/lib/core/settings.py b/lib/core/settings.py
index 8422c691f..e3e8e808d 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.12.17"
+VERSION = "1.2.12.18"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index 9dac3d664..6754fa418 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -49,7 +49,7 @@ c8c386d644d57c659d74542f5f57f632  lib/core/patch.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-380daa313fda2c14c88b69c3461f0e54  lib/core/settings.py
+52a928e8548d5a45bf1a606ffd59fe1b  lib/core/settings.py
 a971ce157d04de96ba6e710d3d38a9a8  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 1581be48127a3a7a9fd703359b6e7567  lib/core/target.py
@@ -478,7 +478,7 @@ d989813ee377252bca2103cea524c06b  xml/banner/sharepoint.xml
 350605448f049cd982554123a75f11e1  xml/banner/x-aspnet-version.xml
 ccb5e02a692f75d11b7fd00f1db48bf5  xml/banner/x-powered-by.xml
 385570003bf7d84f2502191eae8268c6  xml/boundaries.xml
-78de3436ae5ad4b3882d59079f2012e4  xml/errors.xml
+a4130c4e7abfbcb1aaf66386825b6b83  xml/errors.xml
 a279656ea3fcb85c727249b02f828383  xml/livetests.xml
 11547289b99eaced5b55185a3230529a  xml/payloads/boolean_blind.xml
 0656ba4132cd02477be90e65a7ddf6ce  xml/payloads/error_based.xml
diff --git a/xml/errors.xml b/xml/errors.xml
index 60ec971af..3604395e9 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -11,8 +11,9 @@
         <error regexp="check the manual that corresponds to your (MySQL|MariaDB) server version"/>
         <error regexp="Unknown column '[^ ]+' in 'field list'"/>
         <error regexp="MySqlClient\."/>
-        <error regexp="Zend_Db_Statement_Mysqli_Exception"/>
         <error regexp="com\.mysql\.jdbc"/>
+        <error regexp="Zend_Db_(Adapter|Statement)_Mysqli_Exception"/>
+        <error regexp="Pdo[./_\\]Mysql"/>
     </dbms>
 
     <!-- PostgreSQL -->
@@ -27,6 +28,7 @@
         <error regexp="ERROR: parser: parse error at or near"/>
         <error regexp="PostgreSQL query failed"/>
         <error regexp="org\.postgresql\.jdbc"/>
+        <error regexp="Pdo[./_\\]Pgsql"/>
     </dbms>
 
     <!-- Microsoft SQL Server -->
@@ -46,7 +48,9 @@
         <error regexp="com\.jnetdirect\.jsql"/>
         <error regexp="SQLSrvException"/>
         <error regexp="macromedia\.jdbc\.sqlserver"/>
+        <error regexp="Zend_Db_(Adapter|Statement)_Sqlsrv_Exception"/>
         <error regexp="com\.microsoft\.sqlserver\.jdbc"/>
+        <error regexp="Pdo[./_\\](Mssql|SqlSrv)"/>
     </dbms>
 
     <!-- Microsoft Access -->
@@ -69,6 +73,8 @@
         <error regexp="SQL command not properly ended"/>
         <error regexp="macromedia\.jdbc\.oracle"/>
         <error regexp="oracle\.jdbc"/>
+        <error regexp="Zend_Db_(Adapter|Statement)_Oracle_Exception"/>
+        <error regexp="Pdo[./_\\](Oracle|OCI)"/>
     </dbms>
 
     <!-- IBM DB2 -->
@@ -78,6 +84,8 @@
         <error regexp="\bdb2_\w+\("/>
         <error regexp="SQLSTATE.+SQLCODE"/>
         <error regexp="com\.ibm\.db2\.jcc"/>
+        <error regexp="Zend_Db_(Adapter|Statement)_Db2_Exception"/>
+        <error regexp="Pdo[./_\\]Ibm"/>
     </dbms>
 
     <!-- Informix -->
@@ -87,6 +95,7 @@
         <error regexp="ODBC Informix driver"/>
         <error regexp="com\.informix\.jdbc"/>
         <error regexp="weblogic\.jdbc\.informix"/>
+        <error regexp="Pdo[./_\\]Informix"/>
     </dbms>
 
     <!-- Interbase/Firebird -->
@@ -94,6 +103,7 @@
         <error regexp="Dynamic SQL Error"/>
         <error regexp="Warning.*?ibase_"/>
         <error regexp="org\.firebirdsql\.jdbc"/>
+        <error regexp="Pdo[./_\\]Firebird"/>
     </dbms>
 
     <!-- SQLite -->
@@ -108,6 +118,7 @@
         <error regexp="sqlite3.OperationalError:"/>
         <error regexp="SQLite3::SQLException"/>
         <error regexp="org\.sqlite\.JDBC"/>
+        <error regexp="Pdo[./_\\]Sqlite"/>
     </dbms>
 
     <!-- SAP MaxDB -->