Check for empty ViewerRecord array
Merge branch 'empty-vr'

* empty-vr:
  Check for empty ViewerRecord array