* Small crash fix in record handling