Add extra space for docker cmd
Deal with dependencies exceptions