diff --git a/src/register/combocell-gtk.c b/src/register/combocell-gtk.c
index 2a03f4922b..21dc64f9e0 100644
--- a/src/register/combocell-gtk.c
+++ b/src/register/combocell-gtk.c
@@ -174,11 +174,11 @@ xaccSetComboCellValue (ComboCell *cell, const char * str)
 {
   PopBox * box;
   
+  if(!str) str = "";
+  
   SET (&(cell->cell), str);
   box = (PopBox *) (cell->cell.gui_private);
   
-  if(!str) str = "";
-  
   gtk_entry_set_text(GTK_ENTRY(box->combobox->entry), str);
 }