Docker client - fixes 64

Fixes #64.

Part of #608, followup is #712.
If you swap the order of these branches you can drop the `not`