Added warning failsafe