Fixed Exception Catching
Minor Design Changes