Added better error handling, fixed fast engine rebuild condition