Add some more safety checks for RBuffer