1015520: Fixing org not found error
Merge pull request #3093 from daviddavis/temp/20131004083733

1015520: Fixing org not found error