fixed a nullpointerexception error
Merge branch 'origin/feature/mongodb'