composite exception fixes