diff --git a/terminatorlib/plugin.py b/terminatorlib/plugin.py
index 7e76d9c5..9d2be0e2 100644
--- a/terminatorlib/plugin.py
+++ b/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()
diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index 44d95b5c..341285b3 100644
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -275,14 +275,15 @@ class Terminal(Gtk.VBox):
         dbg('close: called')
         self.cnxids.remove_widget(self.vte)
         self.emit('close-term')
-        try:
-            dbg('close: killing %d' % self.pid)
-            os.kill(self.pid, signal.SIGHUP)
-        except Exception as ex:
-            # We really don't want to care if this failed. Deep OS voodoo is
-            # not what we should be doing.
-            dbg('os.kill failed: %s' % ex)
-            pass
+        if self.pid is not None:
+            try:
+                dbg('close: killing %d' % self.pid)
+                os.kill(self.pid, signal.SIGHUP)
+            except Exception as ex:
+                # We really don't want to care if this failed. Deep OS voodoo is
+                # not what we should be doing.
+                dbg('os.kill failed: %s' % ex)
+                pass
 
         if self.vte:
             self.terminalbox.remove(self.vte)