1 files changed, 4 insertions, 1 deletions
diff --git a/lib/rbot/timer.rb b/lib/rbot/timer.rb
index 8e2a6a4a..64b0ee43 100644
--- a/lib/rbot/timer.rb
+++ b/lib/rbot/timer.rb
@@ -214,7 +214,10 @@ class Timer
   end
 
   def stop
-    raise 'already stopped' unless @thread
+    unless @thread
+      warning 'trying to stop already stopped timer'
+      return
+    end
     debug "stopping timer #{self}..."
     @stopping = true
     self.synchronize { @tick.signal }