improving exception handling and fixing messages IT-134