Since ```addon_type``` is used in the rare case, I will add a check for None. Thanks for that catch.