Index: colorblind/Keybinder.py
===================================================================
--- colorblind/Keybinder.py	(revision 736)
+++ colorblind/Keybinder.py	(working copy)
@@ -38,7 +38,7 @@
 			print 'Binding Global shortcut %s to focus the colorblind' % self.keybinding
 			colorblind.keybinder.tomboy_keybinder_bind(self.keybinding, self.on_keyboard_shortcut)
 			self.bound = True
-		except KeyError:
+		except (KeyError, TypeError):
 			# if the requested keybinding conflicts with an existing one, a KeyError will be thrown
 			self.bound = False
 		
Index: colorblind/Makefile.am
===================================================================
--- colorblind/Makefile.am	(revision 736)
+++ colorblind/Makefile.am	(working copy)
@@ -1,7 +1,7 @@
 SUBDIRS = ui osutils data keybinder
 
 colorblind-applet: colorblind-applet.py
-	sed -e "s|\@PYTHONDIR\@|$(pythondir)/colorblind|" $< > $@
+	sed -e "s|\@PYTHONDIR\@|$(pythondir)|" $< > $@
 
 colorblindbindir = $(libdir)/colorblind-applet
 colorblindbin_SCRIPTS = colorblind-applet
