Fixes & small changes (1)

• 2026-04-21 #XCB-5405
  Fatal error when enabling certain add-ons. Fixed. #CDev-Core