Add more info to exception message (EA-52595)