diff --git a/src/libgap-api.c b/src/libgap-api.c
index c02d36ec17..917b42cf37 100644
--- a/src/libgap-api.c
+++ b/src/libgap-api.c
@@ -93,13 +93,8 @@ Obj GAP_EvalString(const char * cmd)
 Obj GAP_ValueGlobalVariable(const char * name)
 {
     UInt gvar = GVarName(name);
-    // TODO: GVarName should never return 0?
-    if (gvar != 0) {
-        return ValGVar(gvar);
-    }
-    else {
-        return NULL;
-    }
+    GAP_ASSERT(gvar != 0);
+    return ValAutoGVar(gvar);
 }
 
 int GAP_CanAssignGlobalVariable(const char * name)