Moved the Exception out