add nullcheck
fix quantity on oredict items