Tidy up error handling in mktccboot