Improved exceptions accuracy, can be #7