TEIIDDES-2017 added null status check