Merge pull request #2201 from greatwitenorth/patch-3

Fixes Cannot read property 'toJSON' of null

packages/strapi-plugin-content-manager/config/queries/bookshelf.js

@@ -184,7 +184,7 @@ module.exports = {
         withRelated: populate || this.associations.map(x => x.alias)
       });
 
-    const data = record.toJSON ? record.toJSON() : record;
+    const data = _.get(record, 'toJSON()', record);
 
     // Retrieve data manually.
     if (_.isEmpty(populate)) {