EDOC-677: Added additional check