Setup and Exception Handling bug fixes