update exceptions and function calls order