checked for NPE
Merge pull request #2 from wololock/issue/npe-in-uom

NPE fixed