Add some error control in the preflight