HEX-1689
Move env.remove_and_unlock to a finally block.
Hopefully this gives a chance to cleanup locking stuff when an exec2 expression fails.