Hendrik Leppkes:
	- Re-design the EJ POI loop to be more error resilient
