CON-2306: Add more details to exception message