Clean up some error-handling issues in ipt_establisher
Closes #1237 (closed).
This branch is on top of !1906 (merged); only the three top commits (starting with 2e06661d) are new.
Closes #1237 (closed).
This branch is on top of !1906 (merged); only the three top commits (starting with 2e06661d) are new.