Code clean up. Stop error when adding records.

[#64020962}