Return failure from undestroy before hooks execute

lib/instance.js

@@ -766,6 +766,8 @@ module.exports = (function() {
    * @return {Promise<undefined>}
    */
   Instance.prototype.undestroy = function(options) {
+    if (!this.Model._timestampAttributes.deletedAt)  return Promise.reject(new Error("Model is not paranoid"));
+
     options = Utils._.extend({
       hooks: true,
       force: false
@@ -780,14 +782,8 @@ module.exports = (function() {
         return self.Model.runHooks('beforeUndestroy', self, options);
       }
     }).then(function() {
-      var identifier;
-
-      if (!self.Model._timestampAttributes.deletedAt) {
-        return Promise.reject(new Error("Model is not paranoid"));
-      } else {
-        self.dataValues[self.Model._timestampAttributes.deletedAt] = null;
-        return self.save(_.extend(_.clone(options), {hooks : false, omitNull : false}));
-      }
+      self.dataValues[self.Model._timestampAttributes.deletedAt] = null;
+      return self.save(_.extend(_.clone(options), {hooks : false, omitNull : false}));
     }).tap(function(result) {
       // Run after hook
       if (options.hooks) {

lib/model.js

@@ -1399,6 +1399,8 @@ module.exports = (function() {
    * @return {Promise<undefined>}
    */
   Model.prototype.undestroy = function(options) {
+    if (!this._timestampAttributes.deletedAt)  return Promise.reject(new Error("Model is not paranoid"));
+
     options = Utils._.extend({
       hooks: true,
       individualHooks: false
@@ -1429,14 +1431,10 @@ module.exports = (function() {
       }
     }).then(function() {
       // Run undelete query
-      if (!self._timestampAttributes.deletedAt) {
-        return Promise.reject(new Error("Model is not paranoid"));
-      } else {
-        var attrValueHash = {};
-        attrValueHash[self._timestampAttributes.deletedAt] = null;
-        options.omitNull = false;
-        return self.QueryInterface.bulkUpdate(self.getTableName(), attrValueHash, options.where, options, self._timestampAttributes.deletedAt);
-      }
+      var attrValueHash = {};
+      attrValueHash[self._timestampAttributes.deletedAt] = null;
+      options.omitNull = false;
+      return self.QueryInterface.bulkUpdate(self.getTableName(), attrValueHash, options.where, options, self._timestampAttributes.deletedAt);
     }).tap(function() {
       // Run afterDestroy hook on each record individually
       if (options.individualHooks) {