Add better handling of strange records.