clearing up error reporting, possibly ready for merging