Improved exception handling and updated README