Waiting knex fired event before load bookshelf

packages/strapi-bookshelf/lib/index.js

@@ -37,16 +37,16 @@ module.exports = function (strapi) {
     initialize: function (cb) {
       let globalName;
 
+      // Only run this logic after the Knex has finished to load.
+      strapi.after('hook:knex:loaded', function () {
+
         // Make sure the Knex hook is present since Knex needs it.
-      if (!strapi.hooks.knex) {
+        if (!strapi.hooks.external.knex) {
           strapi.log.error('Impossible to load the ORM without the query builder!');
           strapi.log.error('You need to install the Strapi query builder with `$ npm install strapi-knex --save`.');
           strapi.stop(1);
         }
 
-      // Only run this logic after the Knex has finished to load.
-      strapi.after('hook:knex:loaded', function () {
-
         // Initialize collections
         _.set(strapi, 'bookshelf.collections', {});
 

packages/strapi/lib/configuration/hooks/dictionary/_hooks/index.js

@@ -63,6 +63,7 @@ module.exports = function (strapi) {
               cb(err);
             }
           }
+
           return memo;
         }, {}));