Fix for TIM-572
Merge pull request #334 from edx/will/multiple-objects-error

Fix for TIM-572