- fix access to potentially undefined data structure