Hotfix

lib/model.js

@@ -700,7 +700,7 @@ module.exports = (function() {
    */
    */
   Model.prototype.findAll = function(options) {
   Model.prototype.findAll = function(options) {
     if (options !== undefined && !_.isPlainObject(options)) {
     if (options !== undefined && !_.isPlainObject(options)) {
-      throw new Error('The argument passed to findOne / findAll must be an options object, use findById if you wish to pass a single primary key value');
+      throw new Error('The argument passed to findAll must be an options object, use findById if you wish to pass a single primary key value');
     }
     }
     // TODO: Remove this in the next major version (4.0)
     // TODO: Remove this in the next major version (4.0)
     if (arguments.length > 1) {
     if (arguments.length > 1) {
@@ -709,7 +709,7 @@ module.exports = (function() {
     var tableNames = {};
     var tableNames = {};
 
 
     tableNames[this.getTableName(options)] = true;
     tableNames[this.getTableName(options)] = true;
-    options = optClone(options || {});
+    options = optClone(options);
 
 
     _.defaults(options, { hooks: true });
     _.defaults(options, { hooks: true });
 
 
@@ -811,7 +811,10 @@ module.exports = (function() {
   * @alias find
   * @alias find
   */
   */
   Model.prototype.findOne = function(options) {
   Model.prototype.findOne = function(options) {
-    options = optClone(options || {});
+    if (options !== undefined && !_.isPlainObject(options)) {
+      throw new Error('The argument passed to findOne must be an options object, use findById if you wish to pass a single primary key value');
+    }
+    options = optClone(options);
 
 
     if (options.limit === undefined && !(options.where && options.where[this.primaryKeyAttribute])) {
     if (options.limit === undefined && !(options.where && options.where[this.primaryKeyAttribute])) {
       options.limit = 1;
       options.limit = 1;
@@ -922,7 +925,9 @@ module.exports = (function() {
    * @alias findAndCountAll
    * @alias findAndCountAll
    */
    */
   Model.prototype.findAndCount = function(findOptions) {
   Model.prototype.findAndCount = function(findOptions) {
-    findOptions = findOptions || {};
+    if (findOptions !== undefined && !_.isPlainObject(findOptions)) {
+      throw new Error('The argument passed to findAndCount must be an options object, use findById if you wish to pass a single primary key value');
+    }
 
 
     var self = this
     var self = this
       // no limit, offset, order, attributes for the options given to count()
       // no limit, offset, order, attributes for the options given to count()