ALM-152 small adjustments to standard error handler