diff --git a/lib/routes/db.js b/lib/routes/db.js
index f1afb4e..240f496 100644
--- a/lib/routes/db.js
+++ b/lib/routes/db.js
@@ -10,9 +10,11 @@ module.exports = function(app, PouchDB) {
   // Create a database
   app.put('/:db', jsonParser, function (req, res, next) {
     var name = encodeURIComponent(req.params.db);
-    new PouchDB(name, function (err, db) {
-      if (err) return res.status(412).send(err);
+    var db = new PouchDB(name);
+    db.info().then(function() {
       res.status(201).send({ok: true});
+    }).catch(function(err) {
+      res.status(412).send(err);
     });
   });
 
@@ -28,11 +30,8 @@ module.exports = function(app, PouchDB) {
   ['/:db/*','/:db'].forEach(function (route) {
     app.all(route, function (req, res, next) {
       var name = encodeURIComponent(req.params.db);
-      new PouchDB(name, function (err, db) {
-        if (err) return res.status(412).send(err);
-        req.db = db;
-        next();
-      });
+      req.db = new PouchDB(name);
+      next();
     });
   });