diff --git a/src/server/api.ts b/src/server/api.ts
index cf1ce6f..fee79cb 100644
--- a/src/server/api.ts
+++ b/src/server/api.ts
@@ -60,22 +60,19 @@ export default function (server, opts, done) {
     if (req.params.id == undefined)
       return reply.code(400).send({ error: "No ID query parameter" });
 
-    server.level.db.get(req.params.id, (err, val) => {
-      if (err) {
+    return server.level.db.get(req.params.id)
+    .then(r=> reply.send(JSON.parse(r)))
+    .catch(err=>{
         console.warn(err);
-        reply.code(500).send();
-      } else {
-        reply.send(JSON.parse(val));
-      }
-    });
-    return reply;
+        return reply.code(500).send({error: "Error with DB"});
+    })
   });
 
   server.post("/:id", async (req, reply) => {
     if (req.params.id == undefined)
       return reply.code(400).send({ error: "No ID query parameter" });
 
-    return server.level.db.get(req.params.id).then(r=>r.version||-1).catch(_=>-1).then(db_version=>{
+    return server.level.db.get(req.params.id).then(r=>JSON.parse(r)).then(r=>r.version||-1).catch(_=>-1).then(db_version=>{
       if(db_version+1 == req.body.version || db_version == -1)
         return server.level.db.put(req.params.id, req.body)
           .then(_=>reply.send({ content: "ok" }))