Fix bug in --host command line option.

A bug was introduced in 144979af8fa25cbe9a578007c01759b5e300453f that forced the --host parameter to be specified or else the program would raise an exception.
Merge branch 'master' into v1.1

Bring in fix for --host command line option.