Sush | #2105 | added more validations around case numbers