#362 NPE in abstract conduit.
Merge branch 'master' into 1.6.4