Fix NPE from EOSification

Change-Id: Iae98ff47ade58e82d50b12922887048ceae5dc34