Ensure clean up occurs after any build error