Fix an issue with error handling, and another with test hook order.
Fix an issue with error handling, and another with test hook order.

ivoneijr/baucis,pjmolina/baucis,mmoulton/baucis,ivoneijr/baucis,capitalPHO/NodeJS