updating exception treatment. related to #6