Moved Exception class into same namespace