Adding check that was removed earlier.[Finishes #80630282]

Fixes #1667