CLC-2410 - Cannot call 'length' & 'filter' of undefined
https://jira.media.berkeley.edu/jira/browse/CLC-2410
Merge pull request #1506 from christianv/CLC-2410

CLC-2410 - Cannot call 'length' & 'filter' of undefined