         async.waterfall [(cb2) ->
             db.query "DELETE FROM items WHERE node=$1 AND id=$2", [ node, itemId ], cb2
         , (res, cb2) ->
-            if res.rowCount < 1
+            if res?.rows?[0]
+                cb2 null
+            else
                 cb2 new errors.NotFound("No such item")
-            else
-                cb2 null
         ], cb
 
     ##

            async.waterfall [(cb2) ->
                db.query "SELECT node FROM nodes WHERE node=$1", [ node ], cb2
            , (res, cb2) ->
                if res.rowCount < 1
                    cb2 new errors.NotFound("Node does not exist")
                else
                    cb2 null
            ], cb

    createNode: (node, cb) ->

        async.waterfall [(cb2) ->
            db.query "SELECT node FROM nodes WHERE node=$1", [ node ], cb2
        , (res, cb2) ->
            if res?.rows?[0]
                # Node already exists: ignore
                cb2(null)
            else
