V2.1.18 - fix problem in error handler