Adjusted errors w/ namespace.
Removing unused file.
Adjusting error messages / exception handling.