Roni | BSHR-395 | Add business logic check