Advanced leak protection