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

https://jira.media.berkeley.edu/jira/browse/CLC-2463