added some fault handling