diff -Nru xchat-indicator-0.3.2/configure xchat-indicator-0.3.3/configure
--- xchat-indicator-0.3.2/configure	2010-02-08 14:04:59.000000000 +0000
+++ xchat-indicator-0.3.3/configure	2010-04-24 04:55:56.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for xchat-indicator 0.3.2.
+# Generated by GNU Autoconf 2.65 for xchat-indicator 0.3.3.
 #
 # Report bugs to <http://launchpad.net/xchat-indicator>.
 #
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='xchat-indicator'
 PACKAGE_TARNAME='xchat-indicator'
-PACKAGE_VERSION='0.3.2'
-PACKAGE_STRING='xchat-indicator 0.3.2'
+PACKAGE_VERSION='0.3.3'
+PACKAGE_STRING='xchat-indicator 0.3.3'
 PACKAGE_BUGREPORT='http://launchpad.net/xchat-indicator'
 PACKAGE_URL=''
 
@@ -1433,7 +1433,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xchat-indicator 0.3.2 to adapt to many kinds of systems.
+\`configure' configures xchat-indicator 0.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1503,7 +1503,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xchat-indicator 0.3.2:";;
+     short | recursive ) echo "Configuration of xchat-indicator 0.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1611,7 +1611,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xchat-indicator configure 0.3.2
+xchat-indicator configure 0.3.3
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1943,7 +1943,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xchat-indicator $as_me 0.3.2, which was
+It was created by xchat-indicator $as_me 0.3.3, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2759,7 +2759,7 @@
 
 # Define the identity of the package.
  PACKAGE='xchat-indicator'
- VERSION='0.3.2'
+ VERSION='0.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11912,7 +11912,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xchat-indicator $as_me 0.3.2, which was
+This file was extended by xchat-indicator $as_me 0.3.3, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11978,7 +11978,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xchat-indicator config.status 0.3.2
+xchat-indicator config.status 0.3.3
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff -Nru xchat-indicator-0.3.2/configure.ac xchat-indicator-0.3.3/configure.ac
--- xchat-indicator-0.3.2/configure.ac	2010-02-08 13:59:17.000000000 +0000
+++ xchat-indicator-0.3.3/configure.ac	2010-04-24 04:51:53.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([xchat-indicator],[0.3.2],[http://launchpad.net/xchat-indicator],[xchat-indicator])
+AC_INIT([xchat-indicator],[0.3.3],[http://launchpad.net/xchat-indicator],[xchat-indicator])
 
 AC_PREREQ([2.60])
 
diff -Nru xchat-indicator-0.3.2/debian/changelog xchat-indicator-0.3.3/debian/changelog
--- xchat-indicator-0.3.2/debian/changelog	2010-04-26 18:24:20.000000000 +0100
+++ xchat-indicator-0.3.3/debian/changelog	2010-04-26 18:24:20.000000000 +0100
@@ -1,3 +1,11 @@
+xchat-indicator (0.3.3-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Fixed crasher, ensure indicator is in the hash table before trying 
+      to remove it (LP: #565061)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 23 Apr 2010 16:40:39 -0400
+
 xchat-indicator (0.3.2-0ubuntu1) lucid; urgency=low
 
   * New upstream release 0.3.2 (LP: #497921)
diff -Nru xchat-indicator-0.3.2/indicator.c xchat-indicator-0.3.3/indicator.c
--- xchat-indicator-0.3.2/indicator.c	2010-02-08 14:04:04.000000000 +0000
+++ xchat-indicator-0.3.3/indicator.c	2010-04-24 04:52:39.000000000 +0100
@@ -103,7 +103,7 @@
 static void
 remove_indicator (const gchar *channel, gpointer indicator)
 {
-	if (indicator != NULL)
+	if (indicator == g_hash_table_lookup (indicators, channel))
 	{
 		g_debug ("INDICATOR: removing indicator for channel %s", channel);
 		indicate_indicator_hide (INDICATE_INDICATOR (indicator));