exceptions handling updates