Should fix #276, by tweaking the reporting mechanisms. Cannot test locally because DB is out of whack...