Fixing exception reporting