Fix problem in error handler, reported by Meinhard
Fix problem in error handler, reported by Meinhard

X-Sharp/XSharpPublic,X-Sharp/XSharpPublic,X-Sharp/XSharpPublic,X-Sharp/XSharpPublic,X-Sharp/XSharpPublic