Improve add ons loading and error handling