--- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-27 21:31:03.000000000 -0400
+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2008-12-24 11:04:52.000000000 -0500
@@ -25,12 +25,16 @@
             if self._timeout_id is not None:
                 gobject.source_remove(self._timeout_id)
                 self._timeout_id = None
-            self._notify.disconnect(self._handler_id)
-            self._handler_id = None
-            self._notify.close()
-            self._notify = None
+            if self._handler_id is not None:
+                self._notify.disconnect(self._handler_id)
+                self._handler_id = None
+            try:
+                self._notify.close()
+                self._notify = None
+            except:
+                pass
             
-    def _on_notification_closed(self, notification, get_reminder_message_func):
+    def _on_notification_closed(self, notification, reason, get_reminder_message_func):
         self._timeout_id = gobject.timeout_add(Notifier._NOTIFICATION_REDISPLAY_INTERVAL_SECONDS * 1000,
                                                self._on_notification_redisplay_timeout,
                                                get_reminder_message_func)