fix bugs in NULL uom handling