Improved exceptions in order to fine-grain react to them