Exception and Namespacing fix