Add exception attribute on findAndDelete
Merge remote-tracking branch 'origin/master'