CLC-2463 - Cannot read property 'weight' of undefined
https://jira.media.berkeley.edu/jira/browse/CLC-2463
Merge pull request #1533 from christianv/CLC-2463

CLC-2463 - Cannot read property 'weight' of undefined