Remove usage of throw