Fix nil docker client (how did this ever work???)
Merge pull request #2163 from lavalamp/fix2

Fix nil docker client (how did this ever work???)