Add exception handling, fix typo.
Merge branch 'master' into testing

Conflicts:
	parser/parsers.py