Changed order of fault handling