improve fault tolerance

Look up this word on Fala2Me