Port NPE fix on Ender IO open from master