Fixed EntityTrap erroring withinvalid entity type.