Needs investigation/repro: Origin set to empty string in some cases (?)

[Zlatkovsky]

See @WrathOfZombies 's comments on issue #593 .

Looks like origin is sometimes ''.

We should check for when this can happen, and/or add asserts for this (to throw a runner failure)