fix some return values (false instead of NULL)