From c615ccf514e04e683885f7478df1bea95857f48c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 27 Sep 2013 14:47:34 +0100
Subject: [PATCH 1/2] dont crash on importing blank html

---
 bin/release.js                    | 34 +++++++++++++++++++++++++++++++
 dirty.db                          |  0
 src/node/handler/ImportHandler.js | 12 +++++++++--
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 bin/release.js
 create mode 100644 dirty.db

diff --git a/bin/release.js b/bin/release.js
new file mode 100644
index 000000000..bac83d84c
--- /dev/null
+++ b/bin/release.js
@@ -0,0 +1,34 @@
+// A script to Release Etherpad.
+
+var etherRelease = {
+  init: function(){
+    // promptUser
+    promptUser(function(){
+      package.update(version){
+        
+
+      }
+    });
+  },
+  versionNumber: function(){
+    get: function(){
+      
+    }
+  },
+  
+
+  versionNumber.get: function(){
+
+
+  },
+
+  /* Continuous integration */
+  ci: function(){
+    hasPassed = function(){
+      // TODO
+      return true;
+    }
+  },
+
+
+}
diff --git a/dirty.db b/dirty.db
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index d6b15eaf6..98909354c 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -28,7 +28,9 @@ var ERR = require("async-stacktrace")
   , settings = require('../utils/Settings')
   , formidable = require('formidable')
   , os = require("os")
-  , importHtml = require("../utils/ImportHtml");
+  , importHtml = require("../utils/ImportHtml")
+  , log4js = require('log4js');
+
 
 //load abiword only if its enabled
 if(settings.abiword != null)
@@ -42,6 +44,8 @@ var tmpDirectory = process.env.TEMP || process.env.TMPDIR || process.env.TMP ||
  */ 
 exports.doImport = function(req, res, padId)
 {
+  var apiLogger = log4js.getLogger("ImportHandler");
+
   //pipe to a file
   //convert file to html via abiword
   //set html in the pad
@@ -169,7 +173,11 @@ exports.doImport = function(req, res, padId)
     function(callback) {
       var fileEnding = path.extname(srcFile).toLowerCase();
       if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
-        importHtml.setPadHTML(pad, text);
+        try{
+          importHtml.setPadHTML(pad, text);
+        }catch(e){
+          apiLogger.warn("Error importing, possibly caused by malformed HTML");
+        }
       } else {
         pad.setText(text);
       }

From 6fbdc2cfd9699d0b1797ee54d2c039ec377cdcca Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 27 Sep 2013 14:49:05 +0100
Subject: [PATCH 2/2] whoops, not supposed to be there

---
 bin/release.js | 34 ----------------------------------
 dirty.db       |  0
 2 files changed, 34 deletions(-)
 delete mode 100644 bin/release.js
 delete mode 100644 dirty.db

diff --git a/bin/release.js b/bin/release.js
deleted file mode 100644
index bac83d84c..000000000
--- a/bin/release.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// A script to Release Etherpad.
-
-var etherRelease = {
-  init: function(){
-    // promptUser
-    promptUser(function(){
-      package.update(version){
-        
-
-      }
-    });
-  },
-  versionNumber: function(){
-    get: function(){
-      
-    }
-  },
-  
-
-  versionNumber.get: function(){
-
-
-  },
-
-  /* Continuous integration */
-  ci: function(){
-    hasPassed = function(){
-      // TODO
-      return true;
-    }
-  },
-
-
-}
diff --git a/dirty.db b/dirty.db
deleted file mode 100644
index e69de29bb..000000000