Deal bit better with invalid bootstrap files