diff --git a/lib/document_handler.js b/lib/document_handler.js
index e5a6b56..83eb141 100644
--- a/lib/document_handler.js
+++ b/lib/document_handler.js
@@ -36,7 +36,7 @@ DocumentHandler.prototype.handleRawGet = function(key, response, skipExpire) {
   this.store.get(key, function(ret) {
     if (ret) {
       winston.verbose('retrieved raw document', { key: key });
-      response.writeHead(200, { 'content-type': 'text/plain' });
+      response.writeHead(200, { 'content-type': 'text/plain; charset=UTF-8' });
       response.end(ret);
     }
     else {
diff --git a/lib/document_stores/rethinkdb.js b/lib/document_stores/rethinkdb.js
index b7ee7ae..ca825af 100644
--- a/lib/document_stores/rethinkdb.js
+++ b/lib/document_stores/rethinkdb.js
@@ -1,39 +1,46 @@
 const crypto = require('crypto');
 const rethink = require('rethinkdbdash');
+const winston = require('winston');
 
-var RethinkDBStore = (options) => {
-  this.client = rethink({
-    silent: true,
-    host: options.host || '127.0.0.1',
-    port: options.port || 28015,
-    db: options.db || 'haste',
-    user: options.user || 'admin',
-    password: options.password || ''
-  });
-};
-
-RethinkDBStore.md5 = (str) => {
+const md5 = (str) => {
   const md5sum = crypto.createHash('md5');
   md5sum.update(str);
   return md5sum.digest('hex');
 };
 
-RethinkDBStore.prototype.set = (key, data, callback) => {
-  try {
-    this.client.table('uploads').insert({ id: RethinkDBStore.md5(key), data: data }).run((error) => {
-      if (error) return callback(false);
+class RethinkDBStore {
+  constructor(options) {
+    this.client = rethink({
+      silent: true,
+      host: options.host || '127.0.0.1',
+      port: options.port || 28015,
+      db: options.db || 'haste',
+      user: options.user || 'admin',
+      password: options.password || ''
+    });
+  }
+
+  set(key, data, callback) {
+    this.client.table('uploads').insert({ id: md5(key), data: data }).run((error) => {
+      if (error) {
+        callback(false);
+        winston.error('failed to insert to table', error);
+        return;
+      }
       callback(true);
     });
-  } catch (err) {
-    callback(false);
   }
-};
 
-RethinkDBStore.prototype.get = (key, callback) => {
-  this.client.table('uploads').get(RethinkDBStore.md5(key)).run((error, result) => {
-    if (error || !result) return callback(false);
-    callback(result.data);
-  });
-};
+  get(key, callback) {
+    this.client.table('uploads').get(md5(key)).run((error, result) => {
+      if (error || !result) {
+        callback(false);
+        if (error) winston.error('failed to insert to table', error);
+        return;
+      }
+      callback(result.data);
+    });
+  }
+}
 
 module.exports = RethinkDBStore;