[14.0] edi_state: do not break when no origin set

[14.0] edi_state: do not break when no origin set #69