NSX integration fixes

Didn't you add that again? I thought it wasn't needed because of the `return` above?