diff --git a/lib/Doctrine/I18n.php b/lib/Doctrine/I18n.php
index 08b6a526d..e608876e4 100644
--- a/lib/Doctrine/I18n.php
+++ b/lib/Doctrine/I18n.php
@@ -47,6 +47,10 @@ class Doctrine_I18n extends Doctrine_Plugin
 
     public function buildDefinition(Doctrine_Table $table)
     {
+    	if (empty($this->_options['fields'])) {
+    	    throw new Doctrine_I18n_Exception('Fields not set.');
+    	}
+
         $this->_options['className'] = str_replace('%CLASS%', 
                                                    $this->_options['table']->getComponentName(),
                                                    $this->_options['className']);
@@ -61,7 +65,7 @@ class Doctrine_I18n extends Doctrine_Plugin
 
         $id = $table->getIdentifier();
 
-        $options = array('className' => $className);
+        $options = array('className' => $this->_options['className']);
 
         $fk = array();
         foreach ((array) $id as $column) {
diff --git a/lib/Doctrine/I18n/Exception.php b/lib/Doctrine/I18n/Exception.php
new file mode 100644
index 000000000..8fa77499f
--- /dev/null
+++ b/lib/Doctrine/I18n/Exception.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+ 
+/**
+ * Doctrine_I18n_Exception
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ */
+class Doctrine_I18n_Exception extends Doctrine_Exception
+{ }