Updated to use the right exception.
Merge branch 'master' of github.com:shiroyuki/Tori

Conflicts:
	test/ut/db/test_expression.py
	tori/db/expression.py