Issue 386 eid does not have to be null