Add some safety cases