Move check for UUID duplication before UUID is registered (OMS-90)