Added BSON ID format error
Merged from master