Merge pull request #2782 from cdibbs/master

avoid cryptic errors by checking for transaction

lib/model.js

@@ -1162,7 +1162,7 @@ module.exports = (function() {
         });
         });
       });
       });
     }).finally(function () {
     }).finally(function () {
-      if (internalTransaction) {
+      if (internalTransaction && this.transaction) {
         // If we created a transaction internally, we should clean it up
         // If we created a transaction internally, we should clean it up
         return this.transaction.commit();
         return this.transaction.commit();
       }
       }