Fix log parsing, and be more robust about failures