second try in removing double exception raising