Moved adding of null (exit) node out of nested-if such that all context ...

...are analyzed