diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index 180517d1..4f0f268b 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -203,7 +203,11 @@ Pad.prototype.getInternalRevisionAText = function getInternalRevisionAText(targe
       {
         curRev++;
         var cs = changesets[curRev];
-        atext = Changeset.applyToAText(cs, atext, apool);
+        try{
+          atext = Changeset.applyToAText(cs, atext, apool);
+        }catch(e) {
+          return callback(e)
+        }
       }
 
       callback(null);
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 90053b41..774ebf08 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -1255,7 +1255,7 @@ function handleChangesetRequest(client, message)
       //build the requested rough changesets and send them back
       getChangesetInfo(padIds.padId, start, end, granularity, function(err, changesetInfo)
       {
-        ERR(err);
+        if(err) return console.error('Error while handling a changeset request for '+padIds.padId, err, message.data);
 
         var data = changesetInfo;
         data.requestID = message.data.requestID;