Added validation to quantity and price columns to catch null pointer exceptions.
Merge origin/master