Except DoesNotExist
Merge remote-tracking branch 'origin/issues/41' into issues/41