Fix OPAL-2103: Error at start when opal has a unit