Fixed exception message passing