Add more info to exception