diff --git a/deluge/component.py b/deluge/component.py
index 6d62979f8..8956eb9b7 100644
--- a/deluge/component.py
+++ b/deluge/component.py
@@ -97,7 +97,8 @@ class Component(object):
         _ComponentRegistry.register(self)
 
     def __del__(self):
-        _ComponentRegistry.deregister(self._component_name)
+        if _ComponentRegistry:
+            _ComponentRegistry.deregister(self._component_name)
         
     def _component_start_timer(self):
         if hasattr(self, "update"):