Reduce locking on TE conduits, fix BC NPE.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>