Internal: Add error boundaries to anything dependent on categories