Remove redundant exception and instantiation