change exception to better smell