Changed exception message handling.