Merge pull request Automattic#15104 from Automattic/vkarpov15/Automatticgh-15022

refactor(query): simplify CastError check

Author: vkarpov15

lib/query.js

@@ -2247,10 +2247,7 @@ Query.prototype.error = function error(err) {
  */
 
 Query.prototype._unsetCastError = function _unsetCastError() {
-  if (this._error == null) {
-    return;
-  }
-  if (this._error != null && !(this._error instanceof CastError)) {
+  if (this._error == null || !(this._error instanceof CastError)) {
     return;
   }
   return this.error(null);