bugfix : review assert and replace by if condition

[120EE0980]

Related to #8649 This PR only incorporates very small part of the solution to the issue.(i.e only replaces assert in 2 files) This is just a draft to confirm whether right path is being followed.(will push other changes after I get an OK from reviewer)