diff --git a/src/engine/Account.c b/src/engine/Account.c
index 96483ad1fb..d9915ddf1e 100644
--- a/src/engine/Account.c
+++ b/src/engine/Account.c
@@ -2849,7 +2849,8 @@ DxaccAccountGetCurrency (const Account *acc)
 gnc_commodity * 
 xaccAccountGetCommodity (const Account *acc)
 {
-    g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
+    if (!GNC_IS_ACCOUNT(acc))
+        return NULL;
     return GET_PRIVATE(acc)->commodity;
 }