Fix error message
Properly handle the old record case
Test old record handling thru the update_listener as well