Making sure options exist for _get_cli_params() (Bug 1394754)

Change-Id: I4f75dfc9f34c3f9e3f01d8d459b6ec7a43f13689
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Merge "Making sure options exist for _get_cli_params() (Bug 1394754)"