diff --git a/bin/convert.js b/bin/convert.js
index 94e9877a3..6006aa6f0 100644
--- a/bin/convert.js
+++ b/bin/convert.js
@@ -156,7 +156,15 @@ function convertPad(padId, callback)
               //parse the pages
               for(var i=0,length=results.length;i<length;i++)
               {
-                parsePage(chatMessages, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
+                try
+                {
+                  parsePage(chatMessages, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
+                }
+                catch (xerr)
+                {
+                  console.log("Could not parse PAD_CHAT_TEXT for padid:", padId);
+                  throw(xerr);
+                }
               }
             }
             
@@ -194,7 +202,15 @@ function convertPad(padId, callback)
               //parse the pages
               for(var i=0,length=results.length;i<length;i++)
               {
-                parsePage(changesetsMeta, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
+                try
+                {
+                  parsePage(changesetsMeta, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
+                }
+                catch (xerr)
+                {
+                  console.log("Could not parse PAD_REVMETA_TEXT for padid:", padId);
+                  throw(xerr);
+                }
               }
             }
             
@@ -228,7 +244,15 @@ function convertPad(padId, callback)
               //parse the pages
               for(var i=0, length=results.length;i<length;i++)
               {
-                parsePage(authors, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
+                try
+                {
+                  parsePage(authors, results[i].PAGESTART, results[i].OFFSETS, results[i].DATA, true);
+                }
+                catch (xerr)
+                {
+                  console.log("Could not parse PAD_AUTHORS_TEXT for padid:", padId);
+                  throw(xerr);
+                }
               }
             }
             
diff --git a/bin/convertSettings.json.template b/bin/convertSettings.json.template
index bdd4e4999..80caa3fc5 100644
--- a/bin/convertSettings.json.template
+++ b/bin/convertSettings.json.template
@@ -1,5 +1,5 @@
 {
-  "etherpad-db": 
+  "etherpadDB":
   {
     "host": "localhost",
     "port": 3306,