Added some more missing fail()s