Minor changes for exception handling and naming conventions.