diff --git a/lib/Doctrine/Connection/Mssql.php b/lib/Doctrine/Connection/Mssql.php
index ab26f8ede..ade9a16c9 100644
--- a/lib/Doctrine/Connection/Mssql.php
+++ b/lib/Doctrine/Connection/Mssql.php
@@ -76,7 +76,7 @@ class Doctrine_Connection_Mssql extends Doctrine_Connection {
      * @return string  quoted identifier string
      */
     public function quoteIdentifier($identifier, $checkOption = false) {
-        if ($check_option && ! $this->options['quote_identifier']) {
+        if ($checkOption && ! $this->options['quote_identifier']) {
             return $identifier;
         }
         return '[' . str_replace(']', ']]', $identifier) . ']';
diff --git a/lib/Doctrine/Connection/Mssql/Exception.php b/lib/Doctrine/Connection/Mssql/Exception.php
index 000ef8361..85a704654 100644
--- a/lib/Doctrine/Connection/Mssql/Exception.php
+++ b/lib/Doctrine/Connection/Mssql/Exception.php
@@ -64,9 +64,10 @@ class Doctrine_Connection_Mssql_Exception extends Doctrine_Connection_Exception
      */
     public function processErrorInfo(array $errorInfo) {
         $code = $errorInfo[1];
-        if(isset(self::$errorCodeMap[$code]))
-            $errorInfo[3] = self::$errorCodeMap[$code];
-            
-        return $errorInfo;
+        if(isset(self::$errorCodeMap[$code])) {
+            $this->portableCode = self::$errorCodeMap[$code];
+            return true;
+        }
+        return false;
     }
 }
diff --git a/lib/Doctrine/Connection/Oracle/Exception.php b/lib/Doctrine/Connection/Oracle/Exception.php
index 40402222c..22f8c4ec7 100644
--- a/lib/Doctrine/Connection/Oracle/Exception.php
+++ b/lib/Doctrine/Connection/Oracle/Exception.php
@@ -61,14 +61,17 @@ class Doctrine_Connection_Oracle_Exception extends Doctrine_Connection_Exception
      * converted into a portable code and then adds this 
      * portable error code to $portableCode field
      *
-     * the portable error code is added at the end of array
-     *
      * @param array $errorInfo      error info array
      * @since 1.0
+     * @return boolean              whether or not the error info processing was successfull
+     *                              (the process is successfull if portable error code was found)
      */
     public function processErrorInfo(array $errorInfo) {
         $code = $errorInfo[1];
-        if(isset(self::$errorCodeMap[$code]))
+        if(isset(self::$errorCodeMap[$code])) {
             $this->portableCode = self::$errorCodeMap[$code];
+            return true;
+        }
+        return false;
     }
 }