2 files changed, 4 insertions, 3 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 79f458aa22..05e8d45702 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -205,8 +205,11 @@ static void
 extract_info(EContactEditorFullname *editor)
 {
 	ECardName *name = editor->name;
-	if (!name)
+	if (!name) {
 		name = e_card_name_new();
+		editor->name = name;
+	}
+
 	name->prefix     = extract_field(editor, "entry-title" );
 	name->given      = extract_field(editor, "entry-first" );
 	name->additional = extract_field(editor, "entry-middle");
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 42782fc549..b41a5e3ae7 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -738,8 +738,6 @@ BonoboUIVerb verbs [] = {
 static void
 create_ui (EContactEditor *ce)
 {
-	char *fname;
-	BonoboUINode *ui;
 	BonoboUIComponent *component;
 	Bonobo_UIContainer container;