Added null check for possible addons