Fixed a bug where instantiation would fail if there are no addons
Fixed a bug where instantiation would fail if there are no addons

Comcast/Xooie,JohnRiv/Xooie,JohnRiv/Xooie,JohnRiv/Xooie,Comcast/Xooie,Comcast/Xooie