Cost validity check
Switch validation order
Merge pull request #242 from CruGlobal/EVENT-120

Cost validity check