#421 fix EIB NullPointer