Fix making of exception messages