Handle nil instead of empty array