Merge "Properly recover from failed compilation."