ajusting error handler behavior
ajusting error handler behavior