removing the 'throw' commands