1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
index 21662a984..2f59d74f2 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
@@ -142,13 +142,13 @@ class CfgGenshiGenerator(CfgGenerator):
         raise
 
     def handle_event(self, event):
-        if event.code2str() == 'deleted':
-            return
         CfgGenerator.handle_event(self, event)
+        if self.data is None:
+            return
         try:
             self.template = self.loader.load(self.name, cls=NewTextTemplate,
                                              encoding=self.encoding)
-        except Exception:
+        except:
             msg = "Cfg: Could not load template %s: %s" % (self.name,
                                                            sys.exc_info()[1])
             LOGGER.error(msg)