[FIX] don't return arrays containing null