Fixes ConflictError on non-existent objects
Merge pull request #264 from pavel-kirienko/upstream-conflict-error

Fixes ConflictError on non-existent objects