fix exception message and CS