removed redundent catches