Feature/mongo 2.6.5 expressions expression

Added some missing or incorrect error codes. Commented out a function which had been duplicated.