More thorough switch to -ncp on engine failure