diff --git a/src/register/ledger-core/split-register-control.c b/src/register/ledger-core/split-register-control.c
index 893e463294..70854a926c 100644
--- a/src/register/ledger-core/split-register-control.c
+++ b/src/register/ledger-core/split-register-control.c
@@ -623,7 +623,8 @@ gnc_split_register_auto_completion (SplitRegister *reg,
   BasicCell *cell;
   Split *split;
 
-  g_return_val_if_fail(reg->do_auto_complete, FALSE);
+  if (!reg->do_auto_complete)
+    return FALSE;
 
   blank_split = xaccSplitLookup (&info->blank_split_guid,
                                  gnc_get_current_book ());