#16 Allow UID_BASED_ID to be null