More error trapping
Merge branch 'release' of github.com:k-int/AggregatorCore into release