update exception handler regarding documentation