Added null check for missing association support.