update engines
improve error catch mechanism