Updated exceptions to compensate for namespace