Adding better exceptions.