diff --git a/MoinMoin/Page.py b/MoinMoin/Page.py
index d4270543f..fb5d6ecfd 100644
--- a/MoinMoin/Page.py
+++ b/MoinMoin/Page.py
@@ -1440,7 +1440,11 @@ def send_page_content(self, request, body, format='wiki', format_args='', do_cac
 
     def format(self, parser):
         """ Format and write page content without caching """
-        parser.format(self.formatter)
+        try:
+            parser.format(self.formatter)
+        except ValueError:
+            logging.error('======================> %s <==========================' % self.page_name)
+            raise
 
     def execute(self, request, parser, code):
         """ Write page content by executing cache code """
diff --git a/MoinMoin/wikiutil.py b/MoinMoin/wikiutil.py
index a573dc5ca..f63a5e850 100644
--- a/MoinMoin/wikiutil.py
+++ b/MoinMoin/wikiutil.py
@@ -1506,11 +1506,15 @@ def parse_quoted_separated(args, separator=',', name_value=True, seplimit=0):
                                    seplimit=seplimit)
     for item in l:
         if isinstance(item, tuple):
-            key, value = item
-            if key is None:
-                key = u''
-            keywords[key] = value
-            positional = trailing
+            try:
+                key, value = item
+                if key is None:
+                    key = u''
+                keywords[key] = value
+                positional = trailing
+            except ValueError:
+                logging.error('Poblem %s' item)
+                raise
         else:
             positional.append(item)