Changed exceptions a bit