Catch correct errors
Merge branch 'master' of https://github.com/kimvais/wilma

Conflicts:
	wilma.py