Bug fixes
Namespace added to Exception