diff --git a/program/models.py b/program/models.py
index ecf3eb593f497f9bc8a588fef31803aa50688d37..50fe398da66e7aaa42fb42bd39a1fa60c1691309 100644
--- a/program/models.py
+++ b/program/models.py
@@ -314,10 +314,10 @@ class Schedule(models.Model):
         rrule = RRule.objects.get(pk=int(sdl['rrule']))
         show = Show.objects.get(pk=int(show_pk))
 
-        is_repetition = True if 'is_repetition' in sdl and sdl['is_repetition'] is True else False
-        default_playlist_id = int(sdl['default_playlist_id']) if sdl['default_playlist_id'] else None
-        add_days_no = int(sdl['add_days_no']) if sdl['add_days_no'] > 0 else None
-        add_business_days_only = True if 'add_business_days_only' in sdl and sdl['add_business_days_only'] is True else False
+        is_repetition = True if sdl.get('is_repetition') is True else False
+        default_playlist_id = int(sdl['default_playlist_id']) if sdl.get('default_playlist_id') else None
+        add_days_no = int(sdl['add_days_no']) if sdl.get('add_days_no') else None
+        add_business_days_only = True if sdl.get('add_business_days_only') is True else False
 
         dstart = parse_date(str(sdl['dstart']))
 
@@ -878,8 +878,8 @@ class Schedule(models.Model):
             # Re-insert post data
             conflicts['projected'] = partly_resolved
             conflicts['solutions'] = saved_solutions
-            conflicts['notes'] = data['notes']
-            conflicts['playlists'] = data['playlists']
+            conflicts['notes'] = data.get('notes')
+            conflicts['playlists'] = data.get('playlists')
 
             return conflicts