diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index e32997bf..4b6809ea 100644
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -1461,7 +1461,7 @@ def held_open(self, widget=None, respawn=False, debugserver=False):
         self.is_held_open = True
         self.titlebar.update()
 
-    def spawn_child(self, init_command=None, widget=None, respawn=False, debugserver=False):
+    def spawn_child(self, widget=None, respawn=False, debugserver=False, init_command=None):
         args = []
         shell = None
         command = init_command
@@ -1492,9 +1492,10 @@ def spawn_child(self, init_command=None, widget=None, respawn=False, debugserver
             command = self.layout_command
         elif debugserver is True:
             details = self.terminator.debug_address
-            dbg('spawning debug session with: %s:%s' % (details[0],
-                details[1]))
-            command = 'telnet %s %s' % (details[0], details[1])
+            if details is not None:
+                dbg('spawning debug session with: %s:%s' % (details[0],
+                    details[1]))
+                command = 'telnet %s %s' % (details[0], details[1])
 
         # working directory set in layout config
         if self.directory:
diff --git a/terminatorlib/terminal_popup_menu.py b/terminatorlib/terminal_popup_menu.py
index fd998ab6..9682c176 100644
--- a/terminatorlib/terminal_popup_menu.py
+++ b/terminatorlib/terminal_popup_menu.py
@@ -110,6 +110,10 @@ def show(self, widget, event=None):
 
         menu.append(Gtk.SeparatorMenuItem())
 
+        item = Gtk.ImageMenuItem.new_with_mnemonic(_('Set W_indow Title'))
+        item.connect('activate', lambda x: terminal.key_edit_window_title())
+        menu.append(item)
+        
         if not terminal.is_zoomed():
             item = Gtk.ImageMenuItem.new_with_mnemonic(_('Split H_orizontally'))
             image = Gtk.Image()