maritz
diff --git a/‎docs/api/ts_universalValidators.js.html
Lines changed: 7 additions & 3 deletions b/‎docs/api/ts_universalValidators.js.html
Lines changed: 7 additions & 3 deletions
diff --git a/‎test/middlewareTests.js
Lines changed: 24 additions & 0 deletions b/‎test/middlewareTests.js
Lines changed: 24 additions & 0 deletions
diff --git a/‎ts/universalValidators.js
Lines changed: 7 additions & 3 deletions b/‎ts/universalValidators.js
Lines changed: 7 additions & 3 deletions
@@ -225,9 +225,13 @@ <h1 class="page-title">ts/universalValidators.js</h1>
           if (options.optional &amp;&amp; !value) {
             return cb(key, true);
           }
-          func(value, options).then((result) => {
-            cb(key, result, name);
-          });
+          try {
+            func(value, options).then((result) => {
+              cb(key, result, name);
+            });
+          } catch (e) {
+            cb(key, false, name);
+          }
         });
       };
 
 
@@ -263,4 +263,28 @@ exports.middleware = {
       t.done();
     });
   },
+
+  middlewareValidateUndefined: function(t) {
+    setup(t, 2, undefined, async (sandbox) => {
+      var val = sandbox.nohmValidations.validate;
+      try {
+        const result = await val('UserMiddlewareMockup', {
+          name: undefined,
+        });
+        t.same(
+          result.result,
+          false,
+          'Validating with name undefined succeeded',
+        );
+        t.same(
+          result.errors,
+          { name: ['length', 'notEmpty'] },
+          'Validating with name undefined had wrong errors object.',
+        );
+      } catch (e) {
+        t.ok(false, 'Validate threw an error on undefined data.');
+      }
+      t.done();
+    });
+  },
 };
@@ -186,9 +186,13 @@
           if (options.optional && !value) {
             return cb(key, true);
           }
-          func(value, options).then((result) => {
-            cb(key, result, name);
-          });
+          try {
+            func(value, options).then((result) => {
+              cb(key, result, name);
+            });
+          } catch (e) {
+            cb(key, false, name);
+          }
         });
       };