Some more FAI error checking