Discard origins when error occurs
Update connector configuration handling