Make warden_ctl more robust

Change-Id: I98e7b773487f842eccedcbb21ff9e00dd075b41c