Discuna errors

Ralf Hiptmairrequested to merge
discuna-errors into master

Wouter's updates based on discuna error reports.

Merge request reports