[#53686031] Fixing this nil category bug again, presumably due to merge conflict.