better error handling
Merge branch 'master' of github.com:rhaining/lucille

Conflicts:
	lucille.py