2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 7898140..cc1da7a 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -105,7 +105,7 @@ class Discussion < ActiveRecord::Base
   private
 
   def find_speaker_by_user user
-    Speaker.find_by_discussion_id_and_user_id!(self.id, user.id)
+    Speaker.find_by_discussion_id_and_user_id(self.id, user.id)
   end
 
   def check_that_has_at_least_two_users
diff --git a/app/models/speaker.rb b/app/models/speaker.rb
index 6105220..86be7dc 100644
--- a/app/models/speaker.rb
+++ b/app/models/speaker.rb
@@ -6,6 +6,7 @@ class Speaker < ActiveRecord::Base
   validates :user, :discussion, :presence => true
   
   after_destroy :destroy_discussion_view
+  after_destroy :destroy_discussion
   
   private
   
@@ -14,4 +15,8 @@ class Speaker < ActiveRecord::Base
     @view.destroy if @view
   end
   
+  def destroy_discussion
+    self.discussion.destroy unless self.discussion.speakers.any?
+  end
+  
 end