Fix Exceptions handling