add optional server, handle errors correctly in watch mode

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>