Buffer safety