diff --git a/app/models/conference.rb b/app/models/conference.rb
index bb028574..90a45345 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -196,10 +196,7 @@ class Conference < ApplicationRecord
   # ====Returns
   #  * +Array+ -> e.g. [0, 3, 3, 5] -> first week 0, second week 3 registrations
   def get_registrations_per_week
-    return [] unless registrations &&
-      registration_period &&
-      registration_period.start_date &&
-      registration_period.end_date
+    return [] unless registrations && registration_period&.start_date && registration_period.end_date
 
     reg = registrations.group(:week).order(:week).count
     start_week = get_registration_start_week
diff --git a/app/models/event_schedule.rb b/app/models/event_schedule.rb
index 5358f0bc..8c5e9753 100644
--- a/app/models/event_schedule.rb
+++ b/app/models/event_schedule.rb
@@ -82,13 +82,13 @@ class EventSchedule < ApplicationRecord
   end
 
   def start_after_end_hour
-    return unless event && start_time && event.program && event.program.conference && event.program.conference.end_hour
+    return unless event && start_time && event.program&.conference && event.program.conference.end_hour
 
     errors.add(:start_time, "can't be after the conference end hour (#{event.program.conference.end_hour})") if start_time.hour >= event.program.conference.end_hour
   end
 
   def start_before_start_hour
-    return unless event && start_time && event.program && event.program.conference && event.program.conference.start_hour
+    return unless event && start_time && event.program&.conference && event.program.conference.start_hour
 
     errors.add(:start_time, "can't be before the conference start hour (#{event.program.conference.start_hour})") if start_time.hour < event.program.conference.start_hour
   end