v4: a few more return NULL possibilities