ticket:13 - revert 'try  except'