Fix exceptions

Conflicts:
	exception.py
Fix exceptions

Conflicts:
	exception.py