Close listeners to prevent race conditions

Signed-off-by: John Tuley <jtuley@pivotal.io>