Composition - external event sources

event source error handling fixes