Fix fatals where fields are empty