Added composite error information and more intelligent Or operator...