More Exception handling
Changed output messages