Added return to all Joi.validate calls. Fix for core users