diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
index 0ecf8c8d4..487b5b50c 100644
--- a/lib/Doctrine/Table.php
+++ b/lib/Doctrine/Table.php
@@ -963,6 +963,10 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable {
      * @return mixed
      */
     final public function enumValue($field, $index) {
+        if ($index instanceof Doctrine_Null)
+        {
+          return $index;
+        }
         return isset($this->options['enumMap'][$field][$index]) ? $this->options['enumMap'][$field][$index] : $index;
     }
     /**