1 files changed, 4 insertions, 6 deletions
diff --git a/src/node/db/API.js b/src/node/db/API.js
index f99a43af..3955d495 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -253,9 +253,7 @@ exports.getHTML = function(padID, rev, callback)
       exportHtml.getPadHTML(pad, undefined, function (err, html)
       {
         if(ERR(err, callback)) return;
-        
         data = {html: html};
-          
         callback(null, data);
       });
     }
@@ -325,17 +323,17 @@ exports.getChatHistory = function(padID, start, end, callback)
     if(!start || !end)
     {
 	  start = 0;
-	  end = pad.chatHead - 1;
+	  end = pad.chatHead;
     }
     
-    if(start >= chatHead)
+    if(start >= chatHead && chatHead > 0)
     {
       callback(new customError("start is higher or equal to the current chatHead","apierror"));
       return;
     }
-    if(end >= chatHead)
+    if(end > chatHead)
     {
-      callback(new customError("end is higher or equal to the current chatHead","apierror"));
+      callback(new customError("end is higher than the current chatHead","apierror"));
       return;
     }