diff --git a/AUTHORS b/AUTHORS
index 82a1dfa4..ac48d7b7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -128,3 +128,4 @@ that much better:
  * Peter Teichman
  * Jakub Kot
  * Jorge Bastida
+ * Martin Alderete https://github.com/malderete
diff --git a/mongoengine/base.py b/mongoengine/base.py
index 013afe78..f73af4cc 100644
--- a/mongoengine/base.py
+++ b/mongoengine/base.py
@@ -252,7 +252,7 @@ class BaseField(object):
             elif value_to_check not in self.choices:
                 msg = ('Value must be %s of %s' %
                        (err_msg, unicode(self.choices)))
-                self.error()
+                self.error(msg)
 
         # check validation argument
         if self.validation is not None:
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 28af1b23..fa7e3965 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1706,6 +1706,41 @@ class FieldTest(unittest.TestCase):
 
         Shirt.drop_collection()
 
+
+    def test_simple_choices_validation_invalid_value(self):
+        """Ensure that error messages are correct.
+        """
+        SIZES = ('S', 'M', 'L', 'XL', 'XXL')
+        COLORS = (('R', 'Red'), ('B', 'Blue'))
+        SIZE_MESSAGE = u"Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
+        COLOR_MESSAGE = u"Value must be one of ['R', 'B']"
+
+        class Shirt(Document):
+            size = StringField(max_length=3, choices=SIZES)
+            color = StringField(max_length=1, choices=COLORS)
+
+        Shirt.drop_collection()
+
+        shirt = Shirt()
+        shirt.validate()
+
+        shirt.size = "S"
+        shirt.color = "R"
+        shirt.validate()
+
+        shirt.size = "XS"
+        shirt.color = "G"
+
+        try:
+            shirt.validate()
+        except ValidationError, error:
+            # get the validation rules
+            error_dict = error.to_dict()
+            self.assertEqual(error_dict['size'], SIZE_MESSAGE)
+            self.assertEqual(error_dict['color'], COLOR_MESSAGE)
+
+        Shirt.drop_collection()
+
     def test_file_fields(self):
         """Ensure that file fields can be written to and their data retrieved
         """