[T5731][FIX] added validation to avoid exception

Merged Javier Vescio requested to merge T5731 into 11.0

Merge request reports