Updated error handler to pass unmodified variables
Updated error handler to pass unmodified variables