Added Boom for error handling