make fault tolerant

and fix the dammed indents