diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py
index 222d204c27..a37007978b 100644
--- a/mayan/apps/metadata/views.py
+++ b/mayan/apps/metadata/views.py
@@ -147,10 +147,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView):
                     metadata_type=metadata_type,
                     defaults={'value': ''}
                 )
-            except Exception as exception:
-                #if getattr(settings, 'DEBUG', False):
-                #    raise
-                #else:
+            except ValidationError as exception:
                 messages.error(
                     self.request,
                     _(