cli.md: Add space
api/server: better error checking to avoid unnecessary panics

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)