DAR-3115 | Zid one more safety check