Fix: Prevent redundant OUT column creation and add null check

Fix: Prevent redundant OUT column creation and add null check #27