Remove unnecessary throwing