Better exception handling, don't stop any more when docker restart
Minor cleaning