fixed merge error in configuring fault handler