Better error handling
Merge branch 'master' of https://github.com/ludw/django-primitivegallery