Tweaked - treating null as an array is a no-no