am fee4ce33: Merge "Cleanup openRecord error handling" into klp-dev

* commit 'fee4ce338d78eeb58af1f66831ead53322d3859e':
  Cleanup openRecord error handling