Referted erorHandler bug fix