diff --git a/dist/angular-validation.js b/dist/angular-validation.js
index 34f394e..df79743 100644
--- a/dist/angular-validation.js
+++ b/dist/angular-validation.js
@@ -778,7 +778,7 @@ angular.module('validation.directive', ['validation.provider']);
             }
           };
 
-          if (isValid.constructor === Object) isValid.then(setFocus);
+          if (isValid && (isValid.constructor === Object)) isValid.then(setFocus);
           else setFocus(isValid);
         });