1690 better exceptions