XLS-564 Fixed null bug in EHCaching org source.