Removed \r
Removed \r
Better Exception handling