2 files changed, 4 insertions, 3 deletions

diff --git a/app/models/event.rb b/app/models/event.rb
index e2e71c9..b8651a8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -2,12 +2,12 @@ class Event < ApplicationRecord
   include RruleHumanizer
 
   belongs_to :node, optional: true
-  has_many   :occurrences
+  has_many   :occurrences, dependent: :destroy
   acts_as_taggable_on :tags
 
   validates :title, presence: true, unless: -> { node_id.present? }
 
-  after_save :generate_occurences
+  after_save :generate_occurrences
 
   def occurrences_in_range start_time, end_time
     self.occurrences.where(
@@ -21,7 +21,7 @@ class Event < ApplicationRecord
   end
 
   private
-    def generate_occurences
+    def generate_occurrences
       Occurrence.generate self
     end
 end
diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb
index 41ef4cb..c6a2380 100644
--- a/app/models/occurrence.rb
+++ b/app/models/occurrence.rb
@@ -27,6 +27,7 @@ class Occurrence < ApplicationRecord
   # event are then calculated and created.
   def self.generate event
     self.where(:event_id => event.id).delete_all
+    return if event.start_time.nil?
     
     node        = event.node
     duration    = (event.end_time - event.start_time)