Added string check to ensure we are passing the correct data not just the entire payload.

Also added clean exit when ctrl-c