Merge "Cleanup openRecord error handling" into klp-dev