diff --git a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
index 9cae3e2aa..321550b3f 100644
--- a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
@@ -55,7 +55,7 @@
         <md-grid-list md-cols="7" md-row-height="2em" md-gutter="0.5em"
                       flex="50" flex-sm="80" flex-xs="100"
                       ng-model="editor.component.repeat.monthdays"
-                      ng-required="editor.component.repeat.month.type == 'bymonthday'"
+                      ng-required="editor.recurrenceMonthDaysAreRequired()"
                       sg-toggle-grid="sg-toggle-grid">
           <md-grid-tile value="1">1</md-grid-tile>
           <md-grid-tile value="2">2</md-grid-tile>
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index d9920f4fe..dad82f582 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -265,7 +265,8 @@
     }
 
     function recurrenceMonthDaysAreRequired() {
-      return vm.component.repeat.frequency == 'monthly' &&
+      return vm.component &&
+        vm.component.repeat.frequency == 'monthly' &&
         vm.component.repeat.month.type == 'bymonthday';
     }