Merge pull request #295 from strottie/master

Minor fixes

terminatorlib/plugin.py

@@ -173,7 +173,7 @@ class URLHandler(Plugin):
 
     def unload(self):
         """Handle being removed"""
-        if not self.match:
+        if not self.handler_name:
             err('unload called without self.handler_name being set')
             return
         terminator = Terminator()

terminatorlib/terminal.py

@@ -275,6 +275,7 @@ class Terminal(Gtk.VBox):
         dbg('close: called')
         self.cnxids.remove_widget(self.vte)
         self.emit('close-term')
+        if self.pid is not None:
             try:
                 dbg('close: killing %d' % self.pid)
                 os.kill(self.pid, signal.SIGHUP)