594fea60ba
Made some safety checks easier to read Co-authored-by: Christophe De La Fuente <56716719+cdelafuente-r7@users.noreply.github.com>