failsafe version of f9eaa29b

I could have guessed that and do it right the 1st time... Sorry !