DSD-11217 Improve null check and fix finding zone

Closes DSD-11217

See merge request !519

(cherry picked from commit 3742a13f)

48ca6102 Improve null check and fix finding zone