[TIMOB-18262] Refactor & safety checks