Force all WiFi traffic through VPN?
I'm using the Private Internet Access app for the same situation. It has a "kill switch" to prevent the leaking. It only works with the private internet access vpn service though.