Handle DoesNotExist (and others)
Merge pull request #1 from tuky/patch-1

Handle DoesNotExist (and others)