Safer passing of owner info (OMS-396)
Merge pull request #194 from opennode/oms-396

Safer passing of owner info (OMS-396)