Improve the error handling
Add the support to run as a Docker container