diff --git a/lib/dao.js b/lib/dao.js
index 458a5b92..62e658fe 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -566,6 +566,7 @@ DataAccessObject.upsert = function(data, options, cb) {
           });
         }
         function done(err, data, info) {
+          if (err) return cb(err);
           var context = {
             Model: Model,
             data: data,