Index: src/register/ledger-core/split-register-control.c
===================================================================
--- src/register/ledger-core/split-register-control.c	(revision 18133)
+++ src/register/ledger-core/split-register-control.c	(working copy)
@@ -1088,20 +1088,28 @@
 {
   BasicCell *cell;
   const char *name;
-  gboolean dummy;
+  Account *account;
 
   cell = gnc_table_layout_get_cell (reg->table->layout, cell_name);
   if (!cell)
     return NULL;
   name = gnc_basic_cell_get_value (cell);
 
+  if (!name || (strlen(name) == 0))
+    return NULL;
+
   /* If 'name' is "-- Split Transaction --" then return NULL or the
      register acct */
   if (!safe_strcmp (name, SPLIT_TRANS_STR)) {
     return NULL;
   }
 
-  return gnc_split_register_get_account_by_name (reg, cell, name, &dummy);
+  /* Find the account */
+  account = gnc_account_lookup_for_register (gnc_get_current_root_account (), name);
+  if (!account)
+	  account = gnc_account_lookup_by_code (gnc_get_current_root_account (), name);
+
+  return account;
 }
 
 static const char *
