Bug multiple referrals cause error.

https://www.pivotaltracker.com/story/show/71186566
Merge pull request #182 from pfschwartz/develop

Bug multiple referrals cause error.