[#ENGINE-17:added aditional checks]