extends + fix file name
early return in handle-error