CDB-3799

safety checks