Added explicit Exception.
Merge branch 'master' into tv

Conflicts:
	src/Config.py