Added more validations of cart for #15