diff --git a/src/components/mdpDatePicker/mdpDatePicker.js b/src/components/mdpDatePicker/mdpDatePicker.js
index 010bff74..539b4850 100644
--- a/src/components/mdpDatePicker/mdpDatePicker.js
+++ b/src/components/mdpDatePicker/mdpDatePicker.js
@@ -397,7 +397,7 @@ module.directive("mdpDatePicker", ["$mdpDatePicker", "$timeout", function($mdpDa
                 scope.model = ngModel;
 
                 scope.isError = function() {
-                    return !!ngModel.$invalid && (!ngModel.$pristine || form.$submitted);
+                    return !!ngModel.$invalid && (!ngModel.$pristine || (form != null && form.$submitted));
                 };
 
                 scope.required = function() {
diff --git a/src/components/mdpTimePicker/mdpTimePicker.js b/src/components/mdpTimePicker/mdpTimePicker.js
index f1525760..515ca64a 100644
--- a/src/components/mdpTimePicker/mdpTimePicker.js
+++ b/src/components/mdpTimePicker/mdpTimePicker.js
@@ -336,7 +336,7 @@ module.directive("mdpTimePicker", ["$mdpTimePicker", "$timeout", function($mdpTi
             scope.model = ngModel;
 
             scope.isError = function() {
-                return !!ngModel.$invalid && (!ngModel.$pristine || form.$submitted);
+                return !!ngModel.$invalid && (!ngModel.$pristine || (form != null && form.$submitted));
             };
 
             scope.required = function() {