Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1576
diff -u -p -r1.1576 ChangeLog
--- ChangeLog	15 May 2006 10:20:33 -0000	1.1576
+++ ChangeLog	25 May 2006 06:10:06 -0000
@@ -1,3 +1,11 @@
+2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #341334
+	
+	* e-component-registry.c: (e_component_registry_peek_info): Check for
+	the presence of the fields before comparing. Exchange component wont
+	have these alias/etc.
+
 2006-05-15  Li Yuan <li.yuan@sun.com>
 
 	Fixes #341525
Index: e-component-registry.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-component-registry.c,v
retrieving revision 1.57
diff -u -p -r1.57 e-component-registry.c
--- e-component-registry.c	24 Aug 2005 03:04:56 -0000	1.57
+++ e-component-registry.c	25 May 2006 06:10:06 -0000
@@ -314,11 +314,11 @@ e_component_registry_peek_info (ECompone
 
 		switch (field) {
 		case ECR_FIELD_ID:
-			if (strcmp (info->id, key) == 0)
+			if (info->id && (strcmp (info->id, key) == 0))
 				return info;
 			break;
 		case ECR_FIELD_ALIAS:
-			if (strcmp (info->alias, key) == 0)
+			if (info->alias && (strcmp (info->alias, key) == 0))
 				return info;
 			break;
 		case ECR_FIELD_SCHEMA:
