Improve exceptions a bit